Commit a1c8fa41 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Update all packages to quote $(TARGET_CC) 



Now that TARGET_CC contains several space-separated words, it must be
used quoted everywhere.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 08235f71

boot/grub/grub.mk

+4 −4
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ $(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked 
	touch $@



$(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)

	$(MAKE) CC="$(TARGET_CC)" -C $(GRUB_DIR)

	rm -f $(GRUB_DIR)/$(GRUB_BINARY)

	$(MAKE) CC=$(TARGET_CC) CFLAGS+=-static -C $(GRUB_DIR)/grub grub

	$(MAKE) CC="$(TARGET_CC)" CFLAGS+=-static -C $(GRUB_DIR)/grub grub

	mkdir -p $(dir $(STAGING_DIR)/$(GRUB_TARGET_BINARY))

	mv $(GRUB_DIR)/$(GRUB_BINARY) $(STAGING_DIR)/$(GRUB_TARGET_BINARY).static

	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)/grub

	$(MAKE) CC="$(TARGET_CC)" -C $(GRUB_DIR)/grub



$(GRUB_DIR)/.installed: $(GRUB_DIR)/$(GRUB_BINARY)

	cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/$(GRUB_TARGET_BINARY)
@@ -99,7 +99,7 @@ endif 
grub: $(GRUB_DIR)/.installed



grub-clean:

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall

	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(GRUB_DIR) uninstall

	-$(MAKE) -C $(GRUB_DIR) clean

	rm -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) \

		$(TARGET_DIR)/sbin/$(GRUB_BINARY) \

boot/grub2/grub2.mk

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked 
	touch $@



$(GRUB2_DIR)/.compiled: $(GRUB2_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(@D)

	$(MAKE) CC="$(TARGET_CC)" -C $(@D)

	touch $@



$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/.compiled
@@ -77,7 +77,7 @@ $(GRUB2_DIR)/.installed: $(GRUB2_DIR)/.compiled 
grub2: host-automake host-autoconf $(GRUB2_DIR)/.installed



grub2-clean:

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall

	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(GRUB2_DIR) uninstall

	-$(MAKE) -C $(GRUB2_DIR) clean



grub2-dirclean:

package/acpid/acpid.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ $(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE) 
	touch $(ACPID_DIR)/.unpacked



$(ACPID_DIR)/acpid: $(ACPID_DIR)/.unpacked

	$(MAKE) CC=$(TARGET_CC) -C $(ACPID_DIR)

	$(MAKE) CC="$(TARGET_CC)" -C $(ACPID_DIR)

	$(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid

	$(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpi_listen

	touch -c $(ACPID_DIR)/acpid $(ACPID_DIR)/acpi_listen

package/busybox/busybox.mk

+3 −3
Original line number Diff line number Diff line
@@ -99,20 +99,20 @@ ifeq ($(BR2_PACKAGE_NETKITTELNET),y) 
	$(SED) "s/^.*CONFIG_TELNETD.*/CONFIG_TELNETD=n/;" $(BUSYBOX_DIR)/.config

	@echo "WARNING!! CONFIG_TELNETD option disabled!"

endif

	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \

	yes "" | $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \

		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig

	touch $@





$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config

	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \

	$(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \

		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \

		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \

		ARCH=$(KERNEL_ARCH) -C $(BUSYBOX_DIR)



$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox

ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)

	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \

	$(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \

		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \

		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \

		ARCH=$(KERNEL_ARCH) -C $(BUSYBOX_DIR) install

package/coreutils/coreutils.mk

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ $(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured 
	rm -f $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)



$(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(COREUTILS_DIR) install

	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(COREUTILS_DIR) install

	# some things go in root rather than usr

	for f in $(BIN_PROGS); do \

		mv $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
@@ -132,7 +132,7 @@ endif 
# If both coreutils and busybox are selected, the corresponding applets

# may need to be reinstated by the clean targets.

coreutils-clean:

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(COREUTILS_DIR) uninstall

	$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(COREUTILS_DIR) uninstall

	-$(MAKE) -C $(COREUTILS_DIR) clean



coreutils-dirclean: