Commit 21ebd572 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Peter Korsgaard
Browse files

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: default avatarLionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 62a41492

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


	New packages: libcdaudio, libdvdnav, libdvdread, hostapd, tcpreplay



	Updated/fixed packages: at, autoconf, bind, binutils, bootutils,

	Updated/fixed packages: at, autoconf, bash, bind, binutils, bootutils,

	busybox, directfb, dnsmasq, e2fsprogs, gstreamer, gperf,

	gst-plugins-bad, flex, hal, iptables, iw, jpeg, kismet, libfuse,

	libpcap, libungif, lighttpd, mesa, mpg123, mtd-utils, neon,

package/bash/bash.mk

+3 −3
Original line number Diff line number Diff line
@@ -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