diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-08-10 21:46:10 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-08-10 21:46:10 +0200 |
| commit | e13711b8e839a9fb0c329aec15e89332841d8870 (patch) | |
| tree | c160738af1ee440e71e0702e2773d91d6848847a /toolchain | |
| parent | 9052e3543c0467e4cf2f80e54083c7c8b0ecbb44 (diff) | |
Revert "cleanup duplicate configure args for gcc"
This reverts commit 104a7e63b5fcdc1bf124142b31498795b23eeb57.
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index e0a0c8655..6c4b0e2e2 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -151,17 +151,17 @@ endif ifeq ($(ADK_TARGET_ARCH_X86),y) ifeq ($(ADK_TARGET_KERNEL_64),y) -GCC_CONFOPTS+= --enable-biarch --enable-targets=all --disable-multilib +GCC_FINAL_CONFOPTS+= --enable-biarch --enable-targets=all --disable-multilib else -GCC_CONFOPTS+= --disable-biarch --disable-multilib +GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) ifneq ($(ADK_TARGET_ABI_X32),) -GCC_CONFOPTS+= --with-abi=x32 +GCC_FINAL_CONFOPTS+= --with-abi=x32 else -GCC_CONFOPTS+= --disable-biarch --disable-multilib +GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif endif @@ -241,6 +241,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: CXXFLAGS="-O0 -g0 -fomit-frame-pointer" \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ + ${GCC_FINAL_CONFOPTS} \ --enable-languages=c \ --disable-shared \ --disable-threads \ |