diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-29 21:22:23 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-29 21:22:23 +0000 |
| commit | 98175bd43dbfc70f473cca6759bc8a2f4e655734 (patch) | |
| tree | 4fb0f5cefa3728fa2b7d895003f321e164db96a0 /toolchain | |
| parent | 37a085768535229cb0025822df2b0b23c9804edb (diff) | |
| download | buildroot-novena-98175bd43dbfc70f473cca6759bc8a2f4e655734.tar.gz buildroot-novena-98175bd43dbfc70f473cca6759bc8a2f4e655734.zip | |
- revert part of 20119 (renaming BR2_ARM_.ABI to BR2_.ABI)
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 2172d1103..1bef774f0 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -139,11 +139,11 @@ ifeq ($(UCLIBC_TARGET_ARCH),arm) $(UCLIBC_DIR)/.oldconfig $(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig $(SED) '/CONFIG_ARM_.ABI/d' $(UCLIBC_DIR)/.oldconfig -ifeq ($(BR2_EABI),y) +ifeq ($(BR2_ARM_EABI),y) /bin/echo "# CONFIG_ARM_OABI is not set" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "CONFIG_ARM_EABI=y" >> $(UCLIBC_DIR)/.oldconfig endif -ifeq ($(BR2_OABI),y) +ifeq ($(BR2_ARM_OABI),y) /bin/echo "CONFIG_ARM_OABI=y" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.oldconfig endif @@ -154,13 +154,13 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips) /bin/echo "# CONFIG_MIPS_N32_ABI is not set"; \ /bin/echo "# CONFIG_MIPS_N64_ABI is not set"; \ ) >> $(UCLIBC_DIR)/.oldconfig -ifeq ($(BR2_OABI),y) +ifeq ($(BR2_MIPS_OABI),y) $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig endif -ifeq ($(BR2_EABI),y) +ifeq ($(BR2_MIPS_EABI),y) $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig endif -ifeq ($(BR2_ABI64),y) +ifeq ($(BR2_MIPS_ABI64),y) $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig endif endif |