summaryrefslogtreecommitdiff
path: root/sub
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-05-06 14:18:44 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-05-06 14:18:44 +0000
commit5a4bb672dcfaacaede314916af52c70f35245b3b (patch)
treea91239c609714627f37be6bd1d350690805f9a97 /sub
parent55fdb2576936a2fad9270a02ceb0f3bb8e0a11ac (diff)
downloadlh-bootstrap-5a4bb672dcfaacaede314916af52c70f35245b3b.tar.xz
Same with BUILD_HOST_CC
Diffstat (limited to 'sub')
-rw-r--r--sub/bearssl/Makefile2
-rw-r--r--sub/busybox/Makefile2
-rw-r--r--sub/dropbear/Makefile2
-rw-r--r--sub/xz/Makefile6
4 files changed, 6 insertions, 6 deletions
diff --git a/sub/bearssl/Makefile b/sub/bearssl/Makefile
index f5e4e3f..aad2254 100644
--- a/sub/bearssl/Makefile
+++ b/sub/bearssl/Makefile
@@ -17,7 +17,7 @@ $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(BEARSSL
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC=$(BUILD_HOST_CC) LD=$(BUILD_HOST_CC) LDDLL=$(BUILD_HOST_CC)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC="$(BUILD_HOST_CC)" LD="$(BUILD_HOST_CC)" LDDLL="$(BUILD_HOST_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile
index 1933d78..e12e3dd 100644
--- a/sub/busybox/Makefile
+++ b/sub/busybox/Makefile
@@ -28,7 +28,7 @@ $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config: $(OUTPUT)/build-host/.l
exec setuidgid $(NORMALUSER) cp -f $(WD)/sub/busybox/host-full-config $@
$(OUTPUT)/build-host/.lh_bb_built: $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC=$(BUILD_HOST_CC)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC="$(BUILD_HOST_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_bb_installed: $(OUTPUT)/build-host/.lh_bb_built $(OUTPUT)/tmp/.lh_layout_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile
index d0941ca..a8def6d 100644
--- a/sub/dropbear/Makefile
+++ b/sub/dropbear/Makefile
@@ -22,7 +22,7 @@ $(OUTPUT)/build-host/.lh_dropbear_patched: $(OUTPUT)/build-host/.lh_dropbear_cop
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_dropbear_configured: $(OUTPUT)/build-host/.lh_dropbear_patched | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC $(BUILD_HOST_CC) export LDFLAGS '-s -static' ./configure --host=$(TRIPLE) --prefix=/opt/dropbear-$(DROPBEAR_VERSION) --disable-syslog --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline --without-pam --enable-bundled-libtom --disable-zlib --enable-static
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC "$(BUILD_HOST_CC)" export LDFLAGS '-s -static' ./configure --host=$(TRIPLE) --prefix=/opt/dropbear-$(DROPBEAR_VERSION) --disable-syslog --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline --without-pam --enable-bundled-libtom --disable-zlib --enable-static
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_dropbear_built: $(OUTPUT)/build-host/.lh_dropbear_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/xz/Makefile b/sub/xz/Makefile
index 73cc950..514e79f 100644
--- a/sub/xz/Makefile
+++ b/sub/xz/Makefile
@@ -44,15 +44,15 @@ $(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied: $(OUTPUT)/sources/.lh_$(XZ_NAME)_dle
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) export CC $(BUILD_HOST_CC) export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --host=$(TRIPLE) --prefix=/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) export CC "$(BUILD_HOST_CC)" export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --host=$(TRIPLE) --prefix=/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS)
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) CC=$(BUILD_HOST_CC)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) CC="$(BUILD_HOST_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) install CC=$(BUILD_HOST_CC) DESTDIR=$(OUTPUT)/rootfs
+ exec cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) install CC="$(BUILD_HOST_CC)" DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt $(XZ_NAME) $(XZ_NAME)-$(XZ_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/$(XZ_NAME)/bin
exec setuidgid $(NORMALUSER) s6-touch $@