jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

bash: remove CC variable when calling make

Browse Source 
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 <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Lionel Landwerlin 2009-12-26 15:03:28 +01:00 committed by Peter Korsgaard
parent 62a4149250
commit 21ebd57287
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -4,7 +4,7 @@
New packages: libcdaudio, libdvdnav, libdvdread, hostapd, tcpreplay 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, busybox, directfb, dnsmasq, e2fsprogs, gstreamer, gperf,
gst-plugins-bad, flex, hal, iptables, iw, jpeg, kismet, libfuse, gst-plugins-bad, flex, hal, iptables, iw, jpeg, kismet, libfuse,
libpcap, libungif, lighttpd, mesa, mpg123, mtd-utils, neon, libpcap, libungif, lighttpd, mesa, mpg123, mtd-utils, neon,

6
package/bash/bash.mk
View File

@ -72,11 +72,11 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
touch $@ touch $@
$(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured $(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) $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
mkdir -p $(TARGET_DIR)/bin 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* rm -f $(TARGET_DIR)/bin/bash*
mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/ mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh) (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 # If both bash and busybox are selected, the /bin/sh symlink
# may need to be reinstated by the clean targets. # may need to be reinstated by the clean targets.
bash-clean: 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) rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
-$(MAKE1) -C $(BASH_DIR) clean -$(MAKE1) -C $(BASH_DIR) clean