mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-11-28 11:40:11 +03:00
repo: fix ent build on mingw
This commit is contained in:
parent
30c329115d
commit
133ef8c779
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -111,5 +111,5 @@ jobs:
|
||||
CACHIX_CACHE: ares
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
|
||||
- run: make build/urbit build/urbit-worker
|
||||
- run: mingw32-make build/urbit build/urbit-worker
|
||||
- run: build/urbit -l -d -B ../../bin/solid.pill -F bus && curl -f --data '{"source":{"dojo":"+hood/exit"},"sink":{"app":"hood"}}' http://localhost:12321
|
||||
|
4
pkg/ent/configure
vendored
4
pkg/ent/configure
vendored
@ -1,5 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
: "${MAKE:=make}"
|
||||
|
||||
log () {
|
||||
echo "$@" >&2;
|
||||
}
|
||||
@ -14,7 +16,7 @@ do
|
||||
|
||||
log "Trying IMPL=$IMPL"
|
||||
|
||||
if IMPL=$impl make >/dev/null 2>/dev/null
|
||||
if IMPL=$impl ${MAKE} >/dev/null 2>/dev/null
|
||||
then sed -i 's|$(error IMPL must be set)|IMPL='"$impl"'|' Makefile
|
||||
log "IMPL=$IMPL works"
|
||||
exit 0
|
||||
|
@ -9,6 +9,8 @@ markfil=.$1~
|
||||
depdirs=
|
||||
nixpath=${NIX_STORE-../build}
|
||||
|
||||
: "${MAKE:=make}"
|
||||
|
||||
# LDFLAGS doesn't like absolute paths
|
||||
if [ "${nixpath:0:1}" == "/" ]
|
||||
then
|
||||
@ -84,7 +86,7 @@ buildnixdep () {
|
||||
[ -e $patch ] && patch -d $dir -p 1 <$patch
|
||||
pushd $dir
|
||||
eval "$cmdprep"
|
||||
eval make "$cmdmake"
|
||||
eval ${MAKE} "$cmdmake"
|
||||
touch $markfil
|
||||
popd
|
||||
fi
|
||||
|
2
pkg/urbit/configure
vendored
2
pkg/urbit/configure
vendored
@ -109,6 +109,8 @@ case $(tr A-Z a-z <<< $os) in
|
||||
mpkgs=(cmake curl gcc jq make)
|
||||
pacman -S --needed autoconf automake-wrapper libtool patch ${mpkgs[@]/#/mingw-w64-x86_64-}
|
||||
|
||||
export MAKE=mingw32-make
|
||||
|
||||
. compat/poor-mans-nix-shell.sh mingw
|
||||
compat/create-include-files.sh 'stat -c %s' /etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user