diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-24 02:19:59 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-24 02:19:59 +0000 |
| commit | 6e9b7a6136d9f0512230495952b462c09ff2738b (patch) | |
| tree | d5144f37f86c5a84fe1434450e7561d4d3a942cb /toolchain | |
| parent | 674c088c981356f586a997d05d973d9cb51c1114 (diff) | |
fix uclibc symlink for nptl
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15007 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
| -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 e7304a171..5706f2057 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -42,10 +42,11 @@ PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)$(PKG_EXTRAVERSION)) ifeq ($(PKG_VERSION_SNAPSHOT),y) - HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION) + UCLIBC_SUBDIR:=uClibc-$(PKG_EXTRAVERSION) else - HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl) + UCLIBC_SUBDIR:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl) endif +HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(UCLIBC_SUBDIR) include $(INCLUDE_DIR)/toolchain-build.mk @@ -78,7 +79,6 @@ endef define Host/Prepare/Snapshot $(PKG_UNPACK) rm -Rf $(HOST_BUILD_DIR) - ln -snf $(BUILD_DIR_TOOLCHAIN)/uClibc $(HOST_BUILD_DIR) $(Host/Patch) $(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used) endef @@ -103,8 +103,8 @@ define Host/Prepare $(call Host/Prepare/Snapshot) else $(call Host/Prepare/Default) - ln -snf $(PKG_NAME)-$(PKG_VERSION)$(PKG_EXTRAVERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) endif + ln -snf $(UCLIBC_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) $(GEN_CONFIG) > $(HOST_BUILD_DIR)/.config ifeq ($(PKG_VERSION),0.9.28) $(call Host/Prepare/V_0_9_28) |