diff options
| author | Mike Baker <mbm@openwrt.org> | 2006-05-12 19:08:03 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2006-05-12 19:08:03 +0000 |
| commit | 20e4ecc021ee9aa4b799b065732f39d9daa5a2c5 (patch) | |
| tree | 6c8591525420de7c8afd05b2261efe6b9071196a /toolchain/uClibc | |
| parent | 7b37cc4da9c275661854482bb61046d4d7a8435f (diff) | |
| download | upstream-20e4ecc021ee9aa4b799b065732f39d9daa5a2c5.tar.gz upstream-20e4ecc021ee9aa4b799b065732f39d9daa5a2c5.tar.bz2 upstream-20e4ecc021ee9aa4b799b065732f39d9daa5a2c5.zip | |
fix BR2_ and CONFIG_ issues
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3769 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc')
| -rw-r--r-- | toolchain/uClibc/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index d77f554a12..19ab0326f6 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk # ############################################################# -ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) +ifeq ($(CONFIG_UCLIBC_VERSION_SNAPSHOT),y) # Be aware that this changes daily.... UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc -UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2 +UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(CONFIG_USE_UCLIBC_SNAPSHOT))).tar.bz2 #" UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots UCLIBC_VER:=PKG_VERSION:=0.${shell date +"%G%m%d"} @@ -50,13 +50,13 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(CP) ./files/config.$(ARCH) $(UCLIBC_DIR)/.config $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ $(UCLIBC_DIR)/.config -ifeq ($(BR2_LARGEFILE),y) +ifeq ($(CONFIG_LARGEFILE),y) $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.config else $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.config endif $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config -ifeq ($(BR2_SOFT_FLOAT),y) +ifeq ($(CONFIG_SOFT_FLOAT),y) $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config endif mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include |