diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-08-22 09:56:41 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-08-22 09:56:41 +0000 |
commit | 956d3eb78bfa798cee3071917aa18517f496078c (patch) | |
tree | 7466bed73247e8265962dfac8570228d2689597d /toolchain/gcc | |
parent | 293b09786c2c436116f1a11ae265f84cb8edb95d (diff) |
- semicolon touchup. No other changes
Diffstat (limited to 'toolchain/gcc')
-rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 48 | ||||
-rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 50 |
2 files changed, 49 insertions, 49 deletions
diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index db85468b9..b365dbc60 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -228,7 +228,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) ln -snf ../include $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include #-rmdir $(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) \ LDFLAGS_FOR_TARGET="$(patsubst %,LDFLAGS+=-Wl$(comma)%,$(TARGET_LDFLAGS)) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ $(GCC_DIR)/configure \ @@ -259,31 +259,31 @@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install - if [ -d "$(STAGING_DIR)/usr/lib64" ] ; then \ - if [ ! -e "$(STAGING_DIR)/usr/lib" ] ; then \ - mkdir "$(STAGING_DIR)/usr/lib" ; \ - fi ; \ - mv "$(STAGING_DIR)/usr/lib64/"* "$(STAGING_DIR)/usr/lib/" ; \ - rmdir "$(STAGING_DIR)/usr/lib64" ; \ + if [ -d "$(STAGING_DIR)/usr/lib64" ]; then \ + if [ ! -e "$(STAGING_DIR)/usr/lib" ]; then \ + mkdir "$(STAGING_DIR)/usr/lib"; \ + fi; \ + mv "$(STAGING_DIR)/usr/lib64/"* "$(STAGING_DIR)/usr/lib/"; \ + rmdir "$(STAGING_DIR)/usr/lib64"; \ fi # Strip the host binaries ifeq ($(GCC_STRIP_HOST_BINARIES),true) -strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/* endif # 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 \ - $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ + $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \ fi - if [ ! -e $(STAGING_DIR)/usr/bin/gcc ] ; then \ - ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ + if [ ! -e $(STAGING_DIR)/usr/bin/gcc ]; then \ + ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \ fi # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR)/usr; \ ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ cd bin; \ - for app in $(REAL_GNU_TARGET_NAME)-* ; do \ + for app in $(REAL_GNU_TARGET_NAME)-*; do \ ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ @@ -294,14 +294,14 @@ endif ifeq ($(BR2_SOFT_FLOAT),y) ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) # 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 # Replace specs file with one that defaults to soft float mode. - if [ ! -f $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \ - echo staging dir specs file is missing ; \ - /bin/false ; \ + if [ ! -f $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ]; then \ + echo staging dir specs file is missing; \ + /bin/false; \ fi cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif @@ -361,7 +361,7 @@ $(GCC_BUILD_DIR3)/.prepared: $(GCC_BUILD_DIR2)/.libs_installed $(GCC_TARGET_PRER touch $@ $(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) \ CFLAGS_FOR_BUILD="-g -O2 $(HOST_CFLAGS)" \ $(TARGET_GCC_FLAGS) \ @@ -446,14 +446,14 @@ 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 \ - 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)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h \ - $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/ ; \ + $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \ fi # 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 # These are in /lib, so... #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index e91275789..eea12895e 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -186,7 +186,7 @@ GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched mkdir -p $(GCC_BUILD_DIR1) - (cd $(GCC_BUILD_DIR1); rm -rf config.cache ; \ + (cd $(GCC_BUILD_DIR1); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ $(GCC_DIR)/configure \ --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 #-rmdir $(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) \ $(GCC_DIR)/configure \ --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 PATH=$(TARGET_PATH) $(MAKE) $(BR2_SYSROOT_STAGING_DESTDIR) \ -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 # Move gcc bug reporting script out of path of real executables 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 endif # 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 \ - $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ + $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \ 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 # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR); \ ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ cd usr/bin; \ - for app in $(REAL_GNU_TARGET_NAME)-* ; do \ + for app in $(REAL_GNU_TARGET_NAME)-*; do \ ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ @@ -318,14 +318,14 @@ endif ifeq ($(BR2_SOFT_FLOAT),y) ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) # 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 # 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 cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif @@ -383,7 +383,7 @@ $(GCC_BUILD_DIR3)/.prepared: $(GCC_BUILD_DIR2)/.libs_installed $(GCC_TARGET_PRER touch $@ $(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_GCC_FLAGS) \ $(GCC_DIR)/configure \ @@ -467,14 +467,14 @@ 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 \ - 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 \ - $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/ ; \ + $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/; \ fi # 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 # These are in /lib, so... #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* |