mirror of
https://github.com/Interlisp/maiko.git
synced 2026-01-11 23:43:19 +00:00
Enable using LDEARCH to set wsl1 as the osversion. Set LDEARCH to get a WSL1 compile on a standard Linux system in Dockerfile_maiko (and hence in the workflow buildRelease.yml).
This commit is contained in:
parent
5dc9233aef
commit
6aafbbcb05
8
.github/workflows/Dockerfile_maiko
vendored
8
.github/workflows/Dockerfile_maiko
vendored
@ -26,14 +26,10 @@ RUN cd ${INSTALL_LOCATION}/bin \
|
||||
RUN cd ${INSTALL_LOCATION}/bin \
|
||||
&& arch="$(./machinetype)" \
|
||||
&& if [ "$arch" = "x86_64" ] || [ "$arch" = "aarch64" ]; then \
|
||||
mv osversion osversion.hold \
|
||||
&& echo "#!/bin/sh" > osversion \
|
||||
&& echo "echo wsl1" >> osversion \
|
||||
&& chmod ugo+x osversion \
|
||||
&& export LDEARCH="${arch}-microsoft-wsl1" \
|
||||
&& ./makeright x cleanup \
|
||||
&& ./makeright x \
|
||||
&& ./makeright init clean \
|
||||
&& ./makeright init \
|
||||
&& mv osversion.hold osversion \
|
||||
&& chmod ugo+x osversion \
|
||||
; \
|
||||
fi
|
||||
|
||||
@ -15,6 +15,7 @@ case "$os" in
|
||||
*-*-freebsd*) echo freebsd ;;
|
||||
*-*-cygwin*) echo cygwin ;;
|
||||
*-*-haiku*) echo haiku ;;
|
||||
*-microsoft-wsl1) echo wsl1 ;;
|
||||
esac
|
||||
### Don't leave the variable set.
|
||||
unset os
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user