diff options
| author | Ryan Prichard <rprichard@google.com> | 2018-01-22 22:27:12 -0800 |
|---|---|---|
| committer | Ryan Prichard <rprichard@google.com> | 2018-01-22 22:46:23 -0800 |
| commit | 89fed6578607187830790c96d7310cf5fc635ffd (patch) | |
| tree | 5ce3499f8161026421966c63cd7ebcf95fb0a399 | |
| parent | 45543d2021642e20e048a5cb5a2cd55f486dc2bf (diff) | |
| download | yasm-ndk-release-r18.tar.gz | |
Use the appropriate i686 or x86_64 mingw-w64 triplendk-r20bndk-r20-beta3ndk-r20-beta2ndk-r20-beta1ndk-r20ndk-r19cndk-r19bndk-r19-beta2ndk-r19-beta1ndk-r19ndk-r18bndk-r18-beta2ndk-r18-beta1ndk-r17bndk-r17-beta2ndk-r17-beta1ndk-r17ndk-release-r20ndk-release-r19ndk-release-r18ndk-release-r17
Test: ./checkbuild.py --system=windows
Test: ./checkbuild.py --system=windows64
Change-Id: Ib39fc3611f7a8c43eb299bfd5980a42537cfad71
| -rwxr-xr-x | build-yasm.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/build-yasm.sh b/build-yasm.sh index 0fd897d9..86e50f21 100755 --- a/build-yasm.sh +++ b/build-yasm.sh @@ -94,13 +94,8 @@ mkdir -p "$BUILD_DIR/src" && copy_directory "$SRC_DIR/yasm" "$BUILD_DIR/src" fail_panic "Could not copy yasm sources to: $BUILD_DIR/src" CONFIGURE_FLAGS="--disable-nls --disable-rpath --prefix=$BUILD_DIR/prefix" -if [ "$MINGW" = "yes" ]; then - # Required for a proper mingw cross compile - CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --host=i586-pc-mingw32" -fi - -if [ "$DARWIN" = "yes" ]; then - # Required for a proper darwin cross compile +if [ "$MINGW" = "yes" -o "$DARWIN" = "yes" ]; then + # Required for a proper mingw or darwin cross compile CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --host=$ABI_CONFIGURE_HOST" fi |