diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-22 10:04:30 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-22 10:04:30 +0000 |
| commit | 79cdd94154ff367a3f9cd9320b6811a4b127289e (patch) | |
| tree | eb1b693e2ad11c87d730822ab4911b17601a5c9b | |
| parent | 6d496c4e6a4298e2124b1223e0d28c315fd4e028 (diff) | |
toolchain/gcc: fix target-gcc for 4.3.x
Includes are in include-fixed and GCC_LIB_SUBDIR needs to be set like for
the rest of 4.x
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index fdc2fa4a3..d3f4d4389 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -484,6 +484,11 @@ else GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) endif endif +GCC_INCLUDE_DIR:=include +ifeq ($(findstring 4.3,$(GCC_VERSION)),4.3) +GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) +GCC_INCLUDE_DIR:=include-fixed +endif $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \ @@ -514,10 +519,10 @@ endif #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h - if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ + if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ - cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/include/syslimits.h \ - $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \ + cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h \ + $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/; \ fi # Make sure we have 'cc'. if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \ |