diff options
Diffstat (limited to 'toolchain')
-rw-r--r-- | toolchain/binutils/binutils.mk | 4 | ||||
-rw-r--r-- | toolchain/ccache/ccache.mk | 22 | ||||
-rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 18 | ||||
-rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 18 | ||||
-rw-r--r-- | toolchain/gdb/gdb.mk | 6 | ||||
-rw-r--r-- | toolchain/uClibc/uclibc.mk | 6 |
6 files changed, 37 insertions, 37 deletions
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 14b252fc4..a3144d29b 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -112,7 +112,7 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched $(MULTILIB) \ --disable-werror \ $(SOFT_FLOAT_CONFIG_OPTION) \ - $(EXTRA_BINUTILS_CONFIG_OPTIONS)); + $(EXTRA_BINUTILS_CONFIG_OPTIONS)) touch $@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured @@ -161,7 +161,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(MULTILIB) \ $(BINUTILS_TARGET_CONFIG_OPTIONS) \ --disable-werror \ - $(SOFT_FLOAT_CONFIG_OPTION) ); + $(SOFT_FLOAT_CONFIG_OPTION) ) touch $@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index cacf74c1d..402b3d4b3 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -39,7 +39,7 @@ $(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched --host=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ - ); + ) touch $@ $(CCACHE_DIR1)/$(CCACHE_BINARY): $(CCACHE_DIR1)/.configured @@ -50,18 +50,18 @@ $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY) cp $(CCACHE_DIR1)/ccache $(STAGING_DIR)/usr/bin # Keep the actual toolchain binaries in a directory at the same level. # Otherwise, relative paths for include dirs break. - mkdir -p $(STAGING_DIR)/usr/bin-ccache; + mkdir -p $(STAGING_DIR)/usr/bin-ccache (cd $(STAGING_DIR)/usr/bin-ccache; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \ - ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc); + ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin-ccache/ (cd $(STAGING_DIR)/usr/bin; \ ln -fs ccache $(GNU_TARGET_NAME)-cc; \ ln -fs ccache $(GNU_TARGET_NAME)-gcc; \ ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \ - ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc); + ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc) ifeq ($(BR2_INSTALL_LIBSTDCPP),y) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \ mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin-ccache/ @@ -71,10 +71,10 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) ln -fs ccache $(GNU_TARGET_NAME)-c++; \ ln -fs ccache $(GNU_TARGET_NAME)-g++;\ ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \ - ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++); + ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++) (cd $(STAGING_DIR)/usr/bin-ccache; \ ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++); + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++) endif ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) @@ -90,20 +90,20 @@ ccache-clean: ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \ - fi; + fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ] ; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \ - fi; + fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ] ; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \ mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \ - fi; + fi rm -rf $(STAGING_DIR)/usr/bin-ccache/* (cd $(STAGING_DIR)/usr/bin; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++); + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++) -$(MAKE) -C $(CCACHE_DIR1) clean ccache-dirclean: @@ -144,7 +144,7 @@ $(CCACHE_DIR2)/.configured: $(CCACHE_DIR2)/.patched --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ - ); + ) touch $@ $(CCACHE_DIR2)/$(CCACHE_BINARY): $(CCACHE_DIR2)/.configured diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index f235e5bb1..e5868b639 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -188,7 +188,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(MULTILIB) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured @@ -250,7 +250,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured @@ -274,10 +274,10 @@ endif 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 ; \ - fi; + fi if [ ! -e $(STAGING_DIR)/usr/bin/gcc ] ; then \ ln -snf gcc $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ; \ - fi; + fi # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_DIR)/usr; \ @@ -287,7 +287,7 @@ endif ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ - ); + ) # # Now for the ugly 3.3.x soft float hack... # @@ -297,12 +297,12 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) 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. 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; + fi cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif @@ -385,7 +385,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ $(EXTRA_GCC_CONFIG_OPTIONS) \ - $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)); + $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured @@ -454,7 +454,7 @@ endif # Make sure we have 'cc'. if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \ ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \ - fi; + fi # These are in /lib, so... #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* #touch -c $(TARGET_DIR)/usr/bin/gcc diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index b01c0805a..82a7bf95e 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -206,7 +206,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(MULTILIB) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured @@ -269,7 +269,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)); + $(EXTRA_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured @@ -298,10 +298,10 @@ endif 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 ; \ - fi; + fi 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 -e; \ (cd $(STAGING_DIR); \ @@ -311,7 +311,7 @@ endif ln -snf $${app} \ $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ - ); + ) # # Now for the ugly 3.3.x soft float hack... # @@ -321,12 +321,12 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) 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. 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 endif endif @@ -406,7 +406,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ $(EXTRA_GCC_CONFIG_OPTIONS) \ - $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)); + $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)) touch $@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured @@ -475,7 +475,7 @@ endif # Make sure we have 'cc'. if [ ! -e $(TARGET_DIR)/usr/bin/cc ] ; then \ ln -snf gcc $(TARGET_DIR)/usr/bin/cc ; \ - fi; + fi # These are in /lib, so... #rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* touch -c $@ diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 3b701e423..60596aeb0 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -105,7 +105,7 @@ $(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked --disable-sim --enable-gdbserver \ --without-included-gettext \ --disable-werror \ - ); + ) ifeq ($(BR2_ENABLE_LOCALE),y) -$(SED) "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile endif @@ -162,7 +162,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked --without-uiout $(DISABLE_GDBMI) \ --disable-tui --disable-gdbtk --without-x \ --without-included-gettext \ - ); + ) touch $@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured @@ -208,7 +208,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked --disable-tui --disable-gdbtk --without-x \ --without-included-gettext \ --enable-threads \ - ); + ) touch $@ $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index c97219b67..28e1c7609 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -302,7 +302,7 @@ else cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ fi; \ - fi; + fi endif touch $@ @@ -354,7 +354,7 @@ else cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(STAGING_DIR)/usr/include/ ; \ fi; \ - fi; + fi endif # Build the host utils. Need to add an install target... $(MAKE1) -C $(UCLIBC_DIR)/utils \ @@ -439,7 +439,7 @@ else cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(TARGET_DIR)/usr/include/ ; \ fi; \ - fi; + fi endif touch -c $@ |