mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-24 05:44:17 +08:00
Fix non podman build.
1. Export version for libtool cause some packages checks for it; 2. Set PATH variable to include redox toolchain before sysroot been created, as it's required by libtool and relibc.
This commit is contained in:
parent
7e66157193
commit
9a3866e758
@ -82,6 +82,7 @@ $(PREFIX)/libtool:
|
||||
"$@.partial"
|
||||
|
||||
touch "$@.partial"
|
||||
echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version
|
||||
mv "$@.partial" "$@"
|
||||
|
||||
$(PREFIX)/libtool-build: $(PREFIX)/libtool $(CONTAINER_TAG)
|
||||
@ -89,11 +90,13 @@ ifeq ($(PODMAN_BUILD),1)
|
||||
$(PODMAN_RUN) $(MAKE) $@
|
||||
else
|
||||
mkdir -p "$@.partial"
|
||||
PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
|
||||
cd "$<" && \
|
||||
./bootstrap \
|
||||
--skip-po \
|
||||
--force \
|
||||
--gnulib-srcdir=./gnulib
|
||||
PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
|
||||
cd "$@.partial" && \
|
||||
cp -rp $(abspath $<)/. ./ && \
|
||||
"$(ROOT)/$</configure" \
|
||||
@ -110,6 +113,7 @@ ifeq ($(PODMAN_BUILD),1)
|
||||
$(PODMAN_RUN) $(MAKE) $@
|
||||
else
|
||||
cp -r "$(PREFIX)/relibc-install/" "$@"
|
||||
PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
|
||||
cd "$(PREFIX)/libtool-build" && \
|
||||
$(MAKE) install -j `$(NPROC)`
|
||||
cd "$@" && $(PREFIX_STRIP)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user