aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/eglibc
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-08-19 12:49:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-08-19 12:49:51 +0000
commitf1f392ab5f9174a11c1cce71567316100187be39 (patch)
tree3c5ffce597429d02d40c40f77b277034d4002ece /toolchain/eglibc
parente0456989091285381c7c2acc3a0fdd6c96f1175e (diff)
downloadupstream-f1f392ab5f9174a11c1cce71567316100187be39.tar.gz
upstream-f1f392ab5f9174a11c1cce71567316100187be39.tar.bz2
upstream-f1f392ab5f9174a11c1cce71567316100187be39.zip
toolchain: fix the sysroot mess by getting rid of $(TOOLCHAIN_DIR)/usr and moving it back to $(TOOLCHAIN_DIR), this change makes the toolchain relocatable again, which should fix the SDK
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/eglibc')
-rw-r--r--toolchain/eglibc/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 3d3a1da5cf..f333f9d8cb 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -62,10 +62,10 @@ EGLIBC_CONFIGURE:= \
CFLAGS="$(EGLIBC_CFLAGS)" \
libc_cv_slibdir="/lib" \
$(HOST_BUILD_DIR)/libc/configure \
- --prefix=/usr \
+ --prefix= \
--build=$(GNU_HOST_NAME) \
--host=$(REAL_GNU_TARGET_NAME) \
- --with-headers=$(TOOLCHAIN_DIR)/usr/include \
+ --with-headers=$(TOOLCHAIN_DIR)/include \
--disable-profile \
--without-gd \
--without-cvs \
@@ -102,7 +102,7 @@ define Stage1/Compile
endef
define Stage1/Install
- mkdir -p $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/{include,lib}
+ mkdir -p $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/{include,lib}
$(EGLIBC_MAKE) -C $(HOST_BUILD_DIR1) \
install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \
install-bootstrap-headers=yes \
@@ -110,10 +110,10 @@ define Stage1/Install
$(EGLIBC_MAKE) -C $(HOST_BUILD_DIR1) \
csu/subdir_lib
( cd $(HOST_BUILD_DIR1); \
- $(CP) csu/crt1.o csu/crti.o csu/crtn.o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/lib/ \
+ $(CP) csu/crt1.o csu/crti.o csu/crtn.o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/lib/ \
)
$(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \
- -o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/lib/libc.so
+ -o $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/lib/libc.so
endef
define Stage2/Configure