Skip to contentSkip to conversation

bash: remove CC variable when calling make

PATCH New Lionel Landwerlin 2 participants 2 messages Dec 26, 2009 – Jan 28, 2010

lore
Share & tools
lore

Lionel Landwerlin

author
#0 lore raw

PATCH 1/1 bash: remove CC variable when calling make

So "/opt/whatever_toolchain/gcc --sysroot $(STAGING_DIR)" isn't stripped to "/opt/whatever_toolchain/gcc", making gcc to look at $(ORIGINAL_TOOLCHAIN_DIRECTORY)/usr/include instead of $(STAGING_DIR)/usr/include. For more CC is already filled when running the configure script.

This problem should only be visible with an external toolchain.

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/bash/bash.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
package/bash/bash.mk +3 -3
index fbb9cfb..705ce8d 100644
@@ -72,11 +72,11 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 	touch $@
 
 $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
-	$(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
+	$(MAKE1) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
 
 $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 	mkdir -p $(TARGET_DIR)/bin
-	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(BASH_DIR) install
 	rm -f $(TARGET_DIR)/bin/bash*
 	mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
 	(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)

@@ -100,7 +100,7 @@ endif
 # If both bash and busybox are selected, the /bin/sh symlink
 # may need to be reinstated by the clean targets.
 bash-clean:
-	-$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	-$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(BASH_DIR) uninstall
 	rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 	-$(MAKE1) -C $(BASH_DIR) clean
Signature · 1 line
1.6.5.7
#1 lore raw

PATCH 1/1 bash: remove CC variable when calling make

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Lionel" == Lionel Landwerlin <[email protected]> writes:

Lionel> So "/opt/whatever_toolchain/gcc --sysroot $(STAGING_DIR)" isn't Lionel> stripped to "/opt/whatever_toolchain/gcc", making gcc to look at Lionel> $(ORIGINAL_TOOLCHAIN_DIRECTORY)/usr/include instead of Lionel> $(STAGING_DIR)/usr/include. For more CC is already filled when Lionel> running the configure script.

Lionel> This problem should only be visible with an external toolchain.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard