StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."

Browse Source
This commit is contained in:
Elliott Hughes
2014-01-11 00:41:24 +00:00
committed by Gerrit Code Review
parent 987616ed09 dddb566eba
commit 37c699c28a
5 changed files with 10 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/combo/TARGET_linux-aarch64.mk
View File

@@ -133,17 +133,8 @@ libthread_db_root := bionic/libthread_db
TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
-print-libgcc-file-name) -print-libgcc-file-name)
# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
# symlinks located in out/ to point to the appropriate kernel KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
# headers. see 'config/kernel_headers.make' for more details
#
ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_C_INCLUDES := \ TARGET_C_INCLUDES := \

13
core/combo/TARGET_linux-arm.mk
View File

@@ -195,17 +195,8 @@ else
endif endif
# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
# symlinks located in out/ to point to the appropriate kernel KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
# headers. see 'config/kernel_headers.make' for more details
#
ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_C_INCLUDES := \ TARGET_C_INCLUDES := \

13
core/combo/TARGET_linux-mips.mk
View File

@@ -186,17 +186,8 @@ else
endif endif
# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
# symlinks located in out/ to point to the appropriate kernel KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
# headers. see 'config/kernel_headers.make' for more details
#
ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_C_INCLUDES := \ TARGET_C_INCLUDES := \

13
core/combo/TARGET_linux-x86.mk
View File

@@ -102,17 +102,8 @@ else
endif endif
endif endif
# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
# symlinks located in out/ to point to the appropriate kernel KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
# headers. see 'config/kernel_headers.make' for more details
#
ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
android_config_h := $(call select-android-config-h,target_linux-x86) android_config_h := $(call select-android-config-h,target_linux-x86)

13
core/combo/TARGET_linux-x86_64.mk
View File

@@ -104,17 +104,8 @@ else
endif endif
endif endif
# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
# symlinks located in out/ to point to the appropriate kernel KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
# headers. see 'config/kernel_headers.make' for more details
#
ifneq ($(CUSTOM_KERNEL_HEADERS),)
KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
else
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_GLOBAL_CFLAGS += \ TARGET_GLOBAL_CFLAGS += \