|
@@ -186,7 +186,7 @@ GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial
|
|
|
|
|
|
$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
|
|
$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
|
|
mkdir -p $(GCC_BUILD_DIR1)
|
|
mkdir -p $(GCC_BUILD_DIR1)
|
|
- (cd $(GCC_BUILD_DIR1); rm -rf config.cache ; \
|
|
|
|
|
|
+ (cd $(GCC_BUILD_DIR1); rm -rf config.cache; \
|
|
$(HOST_CONFIGURE_OPTS) \
|
|
$(HOST_CONFIGURE_OPTS) \
|
|
$(GCC_DIR)/configure \
|
|
$(GCC_DIR)/configure \
|
|
--prefix=$(STAGING_DIR)/usr \
|
|
--prefix=$(STAGING_DIR)/usr \
|
|
@@ -246,7 +246,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
|
|
ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
|
|
ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include
|
|
#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
#ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
#ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
|
|
- (cd $(GCC_BUILD_DIR2); rm -rf config.cache ; \
|
|
|
|
|
|
+ (cd $(GCC_BUILD_DIR2); rm -rf config.cache; \
|
|
$(HOST_CONFIGURE_OPTS) \
|
|
$(HOST_CONFIGURE_OPTS) \
|
|
$(GCC_DIR)/configure \
|
|
$(GCC_DIR)/configure \
|
|
--prefix=$(BR2_SYSROOT_PREFIX)/usr \
|
|
--prefix=$(BR2_SYSROOT_PREFIX)/usr \
|
|
@@ -279,12 +279,12 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
|
|
$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
|
|
$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
|
|
PATH=$(TARGET_PATH) $(MAKE) $(BR2_SYSROOT_STAGING_DESTDIR) \
|
|
PATH=$(TARGET_PATH) $(MAKE) $(BR2_SYSROOT_STAGING_DESTDIR) \
|
|
-C $(GCC_BUILD_DIR2) install
|
|
-C $(GCC_BUILD_DIR2) install
|
|
- if [ -d "$(STAGING_DIR)/lib64" ] ; then \
|
|
|
|
- if [ ! -e "$(STAGING_DIR)/lib" ] ; then \
|
|
|
|
- mkdir "$(STAGING_DIR)/lib" ; \
|
|
|
|
- fi ; \
|
|
|
|
- mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/" ; \
|
|
|
|
- rmdir "$(STAGING_DIR)/lib64" ; \
|
|
|
|
|
|
+ if [ -d "$(STAGING_DIR)/lib64" ]; then \
|
|
|
|
+ if [ ! -e "$(STAGING_DIR)/lib" ]; then \
|
|
|
|
+ mkdir "$(STAGING_DIR)/lib"; \
|
|
|
|
+ fi; \
|
|
|
|
+ mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \
|
|
|
|
+ rmdir "$(STAGING_DIR)/lib64"; \
|
|
fi
|
|
fi
|
|
# Move gcc bug reporting script out of path of real executables
|
|
# Move gcc bug reporting script out of path of real executables
|
|
mv -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gccbug \
|
|
mv -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gccbug \
|
|
@@ -295,19 +295,19 @@ ifeq ($(GCC_STRIP_HOST_BINARIES),true)
|
|
-strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/faked
|
|
-strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/faked
|
|
endif
|
|
endif
|
|
# Make sure we have 'cc'.
|
|
# Make sure we have 'cc'.
|
|
- if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ] ; then \
|
|
|
|
|
|
+ if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \
|
|
ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
|
|
ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
|
|
- $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \
|
|
|
|
|
|
+ $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
|
|
fi
|
|
fi
|
|
- if [ ! -e $(STAGING_DIR)/usr/bin/cc ] ; then \
|
|
|
|
- ln -snf gcc $(STAGING_DIR)/usr/bin/cc ; \
|
|
|
|
|
|
+ if [ ! -e $(STAGING_DIR)/usr/bin/cc ]; then \
|
|
|
|
+ ln -snf gcc $(STAGING_DIR)/usr/bin/cc; \
|
|
fi
|
|
fi
|
|
# Set up the symlinks to enable lying about target name.
|
|
# Set up the symlinks to enable lying about target name.
|
|
set -e; \
|
|
set -e; \
|
|
(cd $(STAGING_DIR); \
|
|
(cd $(STAGING_DIR); \
|
|
ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
|
|
ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
|
|
cd usr/bin; \
|
|
cd usr/bin; \
|
|
- for app in $(REAL_GNU_TARGET_NAME)-* ; do \
|
|
|
|
|
|
+ for app in $(REAL_GNU_TARGET_NAME)-*; do \
|
|
ln -snf $${app} \
|
|
ln -snf $${app} \
|
|
$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
|
|
$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
|
|
done; \
|
|
done; \
|
|
@@ -318,14 +318,14 @@ endif
|
|
ifeq ($(BR2_SOFT_FLOAT),y)
|
|
ifeq ($(BR2_SOFT_FLOAT),y)
|
|
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
|
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
|
|
# Make sure we have a soft float specs file for this arch
|
|
# Make sure we have a soft float specs file for this arch
|
|
- if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \
|
|
|
|
- echo soft float configured but no specs file for this arch ; \
|
|
|
|
- /bin/false ; \
|
|
|
|
|
|
+ if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ]; then \
|
|
|
|
+ echo soft float configured but no specs file for this arch; \
|
|
|
|
+ /bin/false; \
|
|
fi
|
|
fi
|
|
# Replace specs file with one that defaults to soft float mode.
|
|
# Replace specs file with one that defaults to soft float mode.
|
|
- if [ ! -f $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \
|
|
|
|
- echo staging dir specs file is missing ; \
|
|
|
|
- /bin/false ; \
|
|
|
|
|
|
+ if [ ! -f $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ]; then \
|
|
|
|
+ echo staging dir specs file is missing; \
|
|
|
|
+ /bin/false; \
|
|
fi
|
|
fi
|
|
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
|
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
|
|
endif
|
|
endif
|
|
@@ -383,7 +383,7 @@ $(GCC_BUILD_DIR3)/.prepared: $(GCC_BUILD_DIR2)/.libs_installed $(GCC_TARGET_PRER
|
|
touch $@
|
|
touch $@
|
|
|
|
|
|
$(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
|
|
$(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
|
|
- (cd $(GCC_BUILD_DIR3); rm -rf config.cache ; \
|
|
|
|
|
|
+ (cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
$(TARGET_GCC_FLAGS) \
|
|
$(TARGET_GCC_FLAGS) \
|
|
$(GCC_DIR)/configure \
|
|
$(GCC_DIR)/configure \
|
|
@@ -467,14 +467,14 @@ endif
|
|
#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
|
|
#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
|
|
# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
|
|
# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
|
|
# Work around problem of missing syslimits.h
|
|
# Work around problem of missing syslimits.h
|
|
- if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ] ; then \
|
|
|
|
- echo "warning: working around missing syslimits.h" ; \
|
|
|
|
|
|
+ if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \
|
|
|
|
+ echo "warning: working around missing syslimits.h"; \
|
|
cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/include/syslimits.h \
|
|
cp -f $(STAGING_DIR)/$(GCC_LIB_SUBDIR)/include/syslimits.h \
|
|
- $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/ ; \
|
|
|
|
|
|
+ $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \
|
|
fi
|
|
fi
|
|
# Make sure we have 'cc'.
|
|
# Make sure we have 'cc'.
|
|
- if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \
|
|
|
|
- ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \
|
|
|
|
|
|
+ if [ ! -e $(TARGET_DIR)/usr/bin/cc ]; then \
|
|
|
|
+ ln -snf gcc $(TARGET_DIR)/usr/bin/cc; \
|
|
fi
|
|
fi
|
|
# These are in /lib, so...
|
|
# These are in /lib, so...
|
|
#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
|
|
#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
|