diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-08 10:21:16 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-08 10:21:16 +0200 |
| commit | 74708bad1512a917a28c59646d1f9491f6fe9ea6 (patch) | |
| tree | 7f3bf126d8251e99dda6da042be1fe016d59e3c3 /boot | |
| parent | 049cf426e32d6f789439d0d06905c977bfd25c02 (diff) | |
| parent | d0169fda2144ef5dfe25e801d58a227ed119a38c (diff) | |
| download | buildroot-novena-74708bad1512a917a28c59646d1f9491f6fe9ea6.tar.gz buildroot-novena-74708bad1512a917a28c59646d1f9491f6fe9ea6.zip | |
Merge branch 'misc-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/grub/grub.mk | 8 | ||||
| -rw-r--r-- | boot/grub2/grub2.mk | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 3805afec6..401d34640 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -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) \ diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 6c3bbefe3..f939d9a43 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -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: |