Browse Source

toolchain/: get rid of unneeded $(strip ..)

Peter Korsgaard 16 years ago
parent
commit
0e14d4f7ff

+ 2 - 2
toolchain/ccache/ccache.mk

@@ -191,9 +191,9 @@ ccache_target-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_CCACHE)),y)
+ifeq ($(BR2_CCACHE),y)
 TARGETS+=ccache
 endif
-ifeq ($(strip $(BR2_PACKAGE_CCACHE_TARGET)),y)
+ifeq ($(BR2_PACKAGE_CCACHE_TARGET),y)
 TARGETS+=ccache_target
 endif

+ 1 - 1
toolchain/elf2flt/elf2flt.mk

@@ -48,6 +48,6 @@ elf2flt-clean:
 elf2flt-dirclean:
 	rm -rf $(ELF2FLT_SOURCE)
 
-ifeq ($(strip $(BR2_ELF2FLT)),y)
+ifeq ($(BR2_ELF2FLT),y)
 TARGETS+=elf2flt
 endif

+ 4 - 4
toolchain/gcc/Makefile.in

@@ -20,7 +20,7 @@ GCC_SNAP_DATE:=
 endif
 #")))
 
-ifeq ($(strip $(BR2_GCC_USE_SJLJ_EXCEPTIONS)),y)
+ifeq ($(BR2_GCC_USE_SJLJ_EXCEPTIONS),y)
 GCC_USE_SJLJ_EXCEPTIONS:=--enable-sjlj-exceptions
 endif
 
@@ -71,7 +71,7 @@ GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
 endif
 
 # AVR32 GCC configuration
-ifeq ($(strip $(BR2_avr32)),y)
+ifeq ($(BR2_avr32),y)
 EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap
 SOFT_FLOAT_CONFIG_OPTION:=
 EXTRA_GCC_CONFIG_OPTIONS+=--disable-libssp
@@ -84,11 +84,11 @@ TARGET_GCC_FLAGS= CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
 	CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
 	BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)"
 
-ifeq ($(strip $(BR2_PACKAGE_GCC_TARGET)),y)
+ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
 EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
 
 # AVR32 target GCC configuration
-ifeq ($(strip $(BR2_avr32)),y)
+ifeq ($(BR2_avr32),y)
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libmudflap
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libssp
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \

+ 4 - 4
toolchain/gdb/gdb.mk

@@ -173,7 +173,7 @@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
 	$(STRIPCMD) $(GDB_SERVER_DIR)/gdbserver
 
 $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
-ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
+ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
 	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
 	install -c $(GDB_SERVER_DIR)/gdbserver \
 		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
@@ -240,14 +240,14 @@ gdbhost-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_GDB)),y)
+ifeq ($(BR2_PACKAGE_GDB),y)
 TARGETS+=gdb_target
 endif
 
-ifeq ($(strip $(BR2_PACKAGE_GDB_SERVER)),y)
+ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
 TARGETS+=gdbserver
 endif
 
-ifeq ($(strip $(BR2_PACKAGE_GDB_HOST)),y)
+ifeq ($(BR2_PACKAGE_GDB_HOST),y)
 TARGETS+=gdbhost
 endif

+ 1 - 1
toolchain/mklibs/mklibs.mk

@@ -44,6 +44,6 @@ mklibs:
 #
 #############################################################
 
-ifeq ($(strip $(BR2_MKLIBS)),y)
+ifeq ($(BR2_MKLIBS),y)
 mklibs: $(STAGING_DIR)/mklibs-stamp
 endif

+ 2 - 2
toolchain/sstrip/sstrip.mk

@@ -61,10 +61,10 @@ sstrip_target-dirclean:
 #
 #############################################################
 
-ifeq ($(strip $(BR2_PACKAGE_SSTRIP_HOST)),y)
+ifeq ($(BR2_PACKAGE_SSTRIP_HOST),y)
 TARGETS+=sstrip_host
 endif
 
-ifeq ($(strip $(BR2_PACKAGE_SSTRIP_TARGET)),y)
+ifeq ($(BR2_PACKAGE_SSTRIP_TARGET),y)
 TARGETS+=sstrip_target
 endif

+ 1 - 1
toolchain/uClibc/uclibc.mk

@@ -545,7 +545,7 @@ $(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
 	$(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \
 		CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
 		PREFIX=$(TARGET_DIR) utils install_utils
-ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
+ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
 	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
 	install -c $(TARGET_DIR)/usr/bin/ldd \
 		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd