summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Makefile5
-rw-r--r--toolchain/kernel-headers/Makefile4
2 files changed, 4 insertions, 5 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 6285b2af6..caa4b2437 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -135,10 +135,9 @@ endif
endif
ifeq ($(ADK_TARGET_ARCH_X86_64),y)
-ifeq ($(ADK_TARGET_ABI_X32),y)
+ifneq ($(ADK_TARGET_ABI_X32),)
GCC_FINAL_CONFOPTS+= --with-abi=x32
-endif
-ifeq ($(ADK_TARGET_ABI_64),y)
+else
GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib
endif
endif
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index c7c7eefef..1d206c4c1 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -40,8 +40,8 @@ endif
touch $@
$(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
- $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) headers_check
- $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
+ $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) headers_check
+ $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \
headers_install
ifeq ($(ADK_TARGET_ARCH_CRIS),y)