diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-19 12:49:51 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-19 12:49:51 +0000 |
| commit | dc74adf4453d5f9bfaf5896e7de43938ab628472 (patch) | |
| tree | 3c5ffce597429d02d40c40f77b277034d4002ece /toolchain/glibc | |
| parent | 9766ebb6dc715c03e79d8b7cfc5926a754f531b3 (diff) | |
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/glibc')
| -rw-r--r-- | toolchain/glibc/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 5d56d4b98..abd1c5707 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -57,10 +57,10 @@ GLIBC_CONFIGURE:= \ libc_cv_386_tls=yes \ libc_cv_slibdir="/lib" \ $(HOST_BUILD_DIR)/configure \ - --prefix=/usr \ + --prefix=/ \ --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers="$(TOOLCHAIN_DIR)/usr/include" \ + --with-headers="$(TOOLCHAIN_DIR)/include" \ $(if $(CONFIG_mips64)$(CONFIG_mips64el), --enable-kernel="2.6.0") \ --disable-debug \ --disable-profile \ @@ -111,11 +111,11 @@ define Stage1/Install cross-compiling=yes \ install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \ install-headers - [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/bits/stdio_lim.h ] || \ + [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/bits/stdio_lim.h ] || \ $(CP) $(HOST_BUILD_DIR1)/bits/stdio_lim.h \ - $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/bits/stdio_lim.h - [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/gnu/stubs.h ] || \ - touch $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/gnu/stubs.h + $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/bits/stdio_lim.h + [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/gnu/stubs.h ] || \ + touch $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/gnu/stubs.h endef define Stage2/Configure |