diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /toolchain | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 0a41fc9f3..7ceda3d51 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -6,19 +6,19 @@ include Makefile.inc include ../rules.mk include ${TOPDIR}/mk/buildhlp.mk -ifeq ($(ADK_TOOLCHAIN_SSP),y) +ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y) CONFOPTS+= --enable-libssp else CONFOPTS+= --disable-libssp endif -ifeq ($(ADK_TOOLCHAIN_LTO),y) +ifeq ($(ADK_TOOLCHAIN_WITH_LTO),y) CONFOPTS+= --enable-lto else CONFOPTS+= --disable-lto endif -ifeq ($(ADK_TOOLCHAIN_GOLD),y) +ifeq ($(ADK_TOOLCHAIN_WITH_GOLD),y) CONFOPTS+= --enable-gold else CONFOPTS+= --disable-gold diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 0814b16c8..d90f4fe3a 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -65,13 +65,13 @@ GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif endif -ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y) +ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y) GCC_FINAL_CONFOPTS+= --enable-libssp else GCC_FINAL_CONFOPTS+= --disable-libssp endif -ifeq ($(ADK_TOOLCHAIN_GCC_LTO),y) +ifeq ($(ADK_TOOLCHAIN_WITH_LTO),y) GCC_FINAL_CONFOPTS+= --enable-lto else GCC_FINAL_CONFOPTS+= --disable-lto |