From 0693b105167ba16e76ef53c8b5448da0b2622df2 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 1 Nov 2022 14:54:44 +0200 Subject: [PATCH] kernel: Remove darwin support Darwin kernel build is not supported for >=5.10 and non-standard clang versions. Another side effect is that it causes LD_LIBRARY_PATH to get overwritten, which breaks certain configurations. Let's just get rid of it since AOSP darwin build is no longer supported. Change-Id: I9ac642996b90937bd9c52138fb06bf1eff901c8b --- config/BoardConfigKernel.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk index 77dfa9a6..d60297ec 100644 --- a/config/BoardConfigKernel.mk +++ b/config/BoardConfigKernel.mk @@ -93,7 +93,6 @@ KERNEL_MAKE_FLAGS := KERNEL_MAKE_FLAGS += -j$(shell getconf _NPROCESSORS_ONLN) TOOLS_PATH_OVERRIDE := \ - LD_LIBRARY_PATH=$(BUILD_TOP)/prebuilts/tools-lineage/$(HOST_PREBUILT_TAG)/lib:$$LD_LIBRARY_PATH \ PERL5LIB=$(BUILD_TOP)/prebuilts/tools-lineage/common/perl-base # 5.10+ can fully compile without gcc @@ -151,11 +150,7 @@ ifeq (,$(filter 5.10, $(TARGET_KERNEL_VERSION))) endif endif - ifeq ($(HOST_OS),darwin) - KERNEL_MAKE_FLAGS += HOSTCFLAGS="-I$(BUILD_TOP)/external/elfutils/libelf -I/usr/local/opt/openssl/include" HOSTLDFLAGS="-L/usr/local/opt/openssl/lib -fuse-ld=lld" - else - KERNEL_MAKE_FLAGS += CPATH="/usr/include:/usr/include/x86_64-linux-gnu" HOSTLDFLAGS="-L/usr/lib/x86_64-linux-gnu -L/usr/lib64 -fuse-ld=lld" - endif + KERNEL_MAKE_FLAGS += CPATH="/usr/include:/usr/include/x86_64-linux-gnu" HOSTLDFLAGS="-L/usr/lib/x86_64-linux-gnu -L/usr/lib64 -fuse-ld=lld" ifeq ($(KERNEL_ARCH),arm64) # Add 32-bit GCC to PATH so that arm-linux-androidkernel-as is available for CONFIG_COMPAT_VDSO