Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: build/workspaces/build-osx-bundle.sh
- ===================================================================
- --- build/workspaces/build-osx-bundle.sh (revision 21914)
- +++ build/workspaces/build-osx-bundle.sh (working copy)
- @@ -22,13 +22,15 @@
- # Choices are "x86_64" or "i386" (ppc and ppc64 not supported)
- export ARCH=${ARCH:="x86_64"}
- -OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"`
- +# OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"`
- +OSX_VERSION=10.14
- +
- # Set SDK and mimimum required OS X version
- export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"}
- -export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"}
- +export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.8"}
- # 0 A.D. release version, e.g. Alpha 21 is 0.0.21
- -BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.X"}
- +BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.24"}
- # Define compiler as "clang", this is all Mavericks supports.
- # gcc symlinks may still exist, but they are simply clang with
- Index: libraries/osx/build-osx-libs.sh
- ===================================================================
- --- libraries/osx/build-osx-libs.sh (revision 21914)
- +++ libraries/osx/build-osx-libs.sh (working copy)
- @@ -516,7 +516,7 @@
- tar -xf $LIB_ARCHIVE
- pushd $LIB_DIRECTORY/nspr
- - (CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" && make ${JOBS} && make install) || die "NSPR build failed"
- + (CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" --enable-64bit && make ${JOBS} && make install) || die "NSPR build failed"
- popd
- # TODO: how can we not build the dylibs?
- rm -f lib/*.dylib
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement