Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f92abad authored by Ben Cheng's avatar Ben Cheng Committed by Gerrit Code Review
Browse files

Merge "Two quick fixes: fix kernel header location and nostdlib."

parents 8c4efac5 e61dea99

core/combo/TARGET_linux-aarch64.mk

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ ifneq ($(CUSTOM_KERNEL_HEADERS),) 
    KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)

else

    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi

    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/arch-$(TARGET_ARCH)

    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)

endif

KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
@@ -211,7 +211,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
endef



define transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -Bstatic \

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \