diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 14:28:56 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 14:28:56 +0000 |
| commit | 464c6afdb9a0826705fd33daf64755b8108c4e3e (patch) | |
| tree | 629abaf8eb91d496e5f9ac72b3618a433f284914 | |
| parent | 26ad0b129e2897c5ef105fd9d98897afeba452f0 (diff) | |
| download | lh-bootstrap-464c6afdb9a0826705fd33daf64755b8108c4e3e.tar.xz | |
Small incremental build fixes (15)
| -rw-r--r-- | lh-config.dist | 9 | ||||
| -rw-r--r-- | sub/kmod/Makefile | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lh-config.dist b/lh-config.dist index f8acbbb..196319a 100644 --- a/lh-config.dist +++ b/lh-config.dist @@ -6,12 +6,9 @@ OUTPUT= # Most of the build will be performed as that user. NORMALUSER=nobody -# The toolchain for your BUILD system -# BUILD_TRIPLE is the triplet of your native build toolchain (if you want to cross libcs for instance) -# BUILD_BASE is the base directory where to find your native build toolchain's binaries -# Leave them empty if you're using your distro's native compiler. -# BUILD_TRIPLE= -# BUILD_BASE= +# The C compiler for your BUILD system. +# Leave empty if you're using your distro's native compiler. +# BUILD_BUILD_CC= # The toolchain for your TARGET system diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index 63737a9..b90dd58 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -12,8 +12,6 @@ KMOD_TARLETTER := J # is REALLY broken. KMOD_CONFIGURE_OPTIONS := --with-gnu-ld --disable-gtk-doc-html --with-xz --disable-manpages --with-bashcompletiondir=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bash-completions -KMOD_CFLAGS := "-I $(OUTPUT)/build-build/opt/xz/include" -KMOD_LDFLAGS := "-s -L$(OUTPUT)/build-build/opt/xz/lib" $(OUTPUT)/sources/$(KMOD_NAME)-$(KMOD_VERSION).$(KMOD_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed @@ -31,7 +29,7 @@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied: $(OUTPUT)/sources/.lh_$(KMOD_NAME exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied $(OUTPUT)/build-build/.lh_xz_installed | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CC "$(BUILD_BUILD_CC)" export CFLAGS $(KMOD_CFLAGS) export LDFLAGS $(KMOD_LDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CC "$(BUILD_BUILD_CC)" export liblzma_CFLAGS "-I$(OUTPUT)/build-build/opt/xz/include -L$(OUTPUT)/build-build/opt/xz/lib" export liblzma_LIBS "-llzma" ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed |