diff options
Diffstat (limited to 'toolchain/gcc/gcc-uclibc-4.x.mk')
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index e9ab26e56..1a3f80aad 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -70,8 +70,8 @@ endif # ############################################################# -GCC_TARGET_PREREQ = -GCC_STAGING_PREREQ= $(STAGING_DIR)/usr/lib/libc.a +GCC_TARGET_PREREQ= +GCC_STAGING_PREREQ=$(STAGING_DIR)/usr/lib/libc.a GCC_TARGET_LANGUAGES:=c @@ -86,7 +86,7 @@ ifeq ($(BR2_GCC_CROSS_OBJC),y) GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc endif -GCC_COMMON_PREREQ= $(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\ +GCC_COMMON_PREREQ=$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/libgcj*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/objc*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/fortran*)\ @@ -94,9 +94,9 @@ $(wildcard $(BR2_DEPENDS_DIR)/br2/prefer/ima*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/toolchain/sysroot*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/use/sjlj/exceptions*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/shared/libgcc*) -GCC_TARGET_PREREQ += $(GCC_COMMON_PREREQ) \ +GCC_TARGET_PREREQ+=$(GCC_COMMON_PREREQ) \ $(wildcard $(BR2_DEPENDS_DIR)/br2/extra/target/gcc/config/options*) -GCC_STAGING_PREREQ+= $(GCC_COMMON_PREREQ) \ +GCC_STAGING_PREREQ+=$(GCC_COMMON_PREREQ) \ $(wildcard $(BR2_DEPENDS_DIR)/br2/extra/gcc/config/options*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/cross/*) @@ -118,8 +118,8 @@ GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR) ifeq ($(BR2_INSTALL_FORTRAN),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran -#GCC_TARGET_PREREQ += $(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so -#GCC_STAGING_PREREQ+= $(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so +#GCC_TARGET_PREREQ+=$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so +#GCC_STAGING_PREREQ+=$(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)" GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)" endif @@ -333,25 +333,29 @@ endif # # Ok... that's enough of that. # - -mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin + mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin touch $@ $(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These are in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* - cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ + cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* \ + $(TARGET_DIR)/lib/ endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) - cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* \ + $(TARGET_DIR)/usr/lib/ endif ifeq ($(BR2_INSTALL_LIBGCJ),y) cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/ mkdir -p $(TARGET_DIR)/usr/lib/security - cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/ - cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/ + cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security \ + $(TARGET_DIR)/usr/lib/security/ + cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \ + $(TARGET_DIR)/usr/lib/security/ endif touch $@ @@ -364,8 +368,8 @@ gcc-source: $(DL_DIR)/$(GCC_SOURCE) gcc-clean: rm -rf $(GCC_BUILD_DIR2) for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \ - rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog \ - rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \ + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog; \ + rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \ done gcc-dirclean: gcc_initial-dirclean @@ -465,7 +469,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #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 if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ |