From f94aeb237f25bd7a2191ef052a1ff86b46c3aa4c Mon Sep 17 00:00:00 2001 From: Vicente Eduardo Ferrer Garcia Date: Tue, 7 Dec 2021 11:00:16 +0100 Subject: [PATCH] Add base for mingw triplet. --- scripts/build.sh | 2 +- scripts/deps.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 9164be8..f99c469 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -26,7 +26,7 @@ export GUILE_WARN_DEPRECATED='detailed' `# Test` `# && guix package -i metacall -L /metacall/source` \ `# Lint` `# && guix lint metacall` \ `# Pack uses --no-grafts option in order to avoid conflicts between duplicated versions` \ -`# Pack` && guix pack --no-grafts -S /gnu/bin=bin -S /gnu/etc=etc -S /gnu/lib=lib -RR metacall glibc-utf8-locales nss-certs -L /metacall/nonguix -L /metacall/source | tee build.log \ +`# Pack` && guix pack --no-grafts --target=x86_64-w64-mingw32 -S /gnu/bin=bin -S /gnu/etc=etc -S /gnu/lib=lib -RR metacall glibc-utf8-locales nss-certs -L /metacall/nonguix -L /metacall/source | tee build.log \ `# Copy` && mv `cat build.log | grep "tarball-pack.tar.gz"` /metacall/pack/tarball.tar.gz \ `# Exit` && exit 0 || exit 1 diff --git a/scripts/deps.sh b/scripts/deps.sh index 8c7d887..98477c7 100755 --- a/scripts/deps.sh +++ b/scripts/deps.sh @@ -27,9 +27,12 @@ export GUILE_WARN_DEPRECATED='detailed' && cd /metacall/nonguix \ && `# Fix nonguix version` git checkout bdad9592bb425647b5535a9758f27127f586bc28 \ && apk del git-deps \ -`# Build` && guix build --fallback \ +`# Build` && guix build --target=x86_64-w64-mingw32 --fallback \ glibc-utf8-locales nss-certs \ + libnode-lts \ + -L /metacall/nonguix -L /metacall/source \ +`# Build` && guix build --fallback \ `# dotnet codeanalysis-csharp codeanalysis-common codeanalysis-analyzers` \ - cherow typescript libnode-lts \ + cherow typescript \ -L /metacall/nonguix -L /metacall/source \ `# Exit` && exit 0 || exit 1