# 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
 
 elf2flt-dirclean:
        rm -rf $(ELF2FLT_SOURCE)
 
-ifeq ($(strip $(BR2_ELF2FLT)),y)
+ifeq ($(BR2_ELF2FLT),y)
 TARGETS+=elf2flt
 endif
 
 endif
 #")))
 
-ifeq ($(strip $(BR2_GCC_USE_SJLJ_EXCEPTIONS)),y)
+ifeq ($(BR2_GCC_USE_SJLJ_EXCEPTIONS),y)
 GCC_USE_SJLJ_EXCEPTIONS:=--enable-sjlj-exceptions
 endif
 
 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
        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 \
 
        $(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
 # 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
 
 #
 #############################################################
 
-ifeq ($(strip $(BR2_MKLIBS)),y)
+ifeq ($(BR2_MKLIBS),y)
 mklibs: $(STAGING_DIR)/mklibs-stamp
 endif
 
 #
 #############################################################
 
-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
 
        $(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