summaryrefslogtreecommitdiff
path: root/sub/syslinux
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-03-23 00:44:58 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-03-23 00:44:58 +0000
commit505996ce0e385ab90f95532a8302c995fb8418b6 (patch)
treed46ccbc8028f1b1b61126898f60fa5f80b5e4222 /sub/syslinux
parentaf8d78e093c10e3b1fc1be03ada6d18ac2cb7698 (diff)
downloadlh-bootstrap-505996ce0e385ab90f95532a8302c995fb8418b6.tar.xz
Attempt to rip musl from build-build, to support more distro compilers
Diffstat (limited to 'sub/syslinux')
-rw-r--r--sub/syslinux/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/sub/syslinux/Makefile b/sub/syslinux/Makefile
index 1a0b100..8c7f5d2 100644
--- a/sub/syslinux/Makefile
+++ b/sub/syslinux/Makefile
@@ -17,7 +17,7 @@ SYSLINUX_TAREXT := tar.xz
SYSLINUX_TARLETTER := J
SYSLINUX_CFLAGS := "-I $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/include"
-SYSLINUX_LDFLAGS := "-s -static -L $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/lib"
+SYSLINUX_LDFLAGS := "-s -L $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/lib"
SYSLINUX_INSTALLROOT := $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)
@@ -70,11 +70,11 @@ $(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied: $(OUTPUT)/sources/.lh_$(NASM_NAME
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(NASM_NAME)_configured: $(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src export LDFLAGS -static ./configure --prefix=$(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION) --enable-static
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src ./configure --prefix=$(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(NASM_NAME)_built: $(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src $(MAKE) LDFLAGS=-static
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src $(MAKE)
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(NASM_NAME)_installed: $(OUTPUT)/build-build/.lh_$(NASM_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed