tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 24834ffd: am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."

Browse source 
* commit '24834ffddd64f80c93089033c214f0996c2f18c6':
  Two quick fixes: fix kernel header location and nostdlib.
This commit is contained in:
Ben Cheng 2013-10-25 18:13:14 -07:00 committed by Android Git Automerger
commit 4f2abfff48
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/combo/TARGET_linux-aarch64.mk
View file

@ -135,7 +135,7 @@ ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi 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 endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
@ -211,7 +211,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
endef endef
define transform-o-to-static-executable-inner define transform-o-to-static-executable-inner
$(hide) $(PRIVATE_CXX) -Bstatic \ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
-o $@ \ -o $@ \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \