YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for build on msys2

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-05-31 17:14:44 +02:00 committed by Ugljesa Jovanovic
parent 592ffaa99b
commit 58e74a0cf0
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sodiumWrapper/configure vendored
View File

@ -4,7 +4,9 @@
PREFIX="${PREFIX:-$PWD}" PREFIX="${PREFIX:-$PWD}"
KONAN="${KONAN:-$HOME/.konan}" KONAN="${KONAN:-$HOME/.konan}"
ARCH=${ARCH:-$(uname -m)} ARCH=${ARCH:-$(uname -m)}
echo $PREFIX
echo $KONAN
echo $ARCH
cd libsodium cd libsodium
./autogen.sh -s -f ./autogen.sh -s -f
@ -12,16 +14,29 @@ cd libsodium
if [ -z "$SYSROOT" ]; then if [ -z "$SYSROOT" ]; then
case $(uname -a) in case $(uname -a) in
**Linux*x86_64**) **Linux*x86_64**)
echo "Linux env"
GCC=${GCC:-gcc} GCC=${GCC:-gcc}
GCC=gcc GCC=gcc
export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1)
;; ;;
**Darwin*x86_64**) **Darwin*x86_64**)
echo "Darwin env"
GCC=${GCC:-clang} GCC=${GCC:-clang}
export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1)
;; ;;
**MSYS*x86_64**)
echo "Msys env"
GCC=clang.exe
export CC=$(find $KONAN/dependencies -wholename *${ARCH}*/bin/*$GCC | head -n1)
;;
esac esac
export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1)
echo "CC"
echo $CC
fi fi
./configure --prefix=$PREFIX "$@" ./configure --prefix=$PREFIX "$@"