Advertisement
Guest User

Untitled

a guest
Nov 7th, 2018
104
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.72 KB | None | 0 0
  1. Index: build/workspaces/build-osx-bundle.sh
  2. ===================================================================
  3. --- build/workspaces/build-osx-bundle.sh    (revision 21914)
  4. +++ build/workspaces/build-osx-bundle.sh    (working copy)
  5. @@ -22,13 +22,15 @@
  6.  # Choices are "x86_64" or  "i386" (ppc and ppc64 not supported)
  7.  export ARCH=${ARCH:="x86_64"}
  8.  
  9. -OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"`
  10. +# OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"`
  11. +OSX_VERSION=10.14
  12. +
  13.  # Set SDK and mimimum required OS X version
  14.  export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"}
  15. -export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"}
  16. +export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.8"}
  17.  
  18.  # 0 A.D. release version, e.g. Alpha 21 is 0.0.21
  19. -BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.X"}
  20. +BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.24"}
  21.  
  22.  # Define compiler as "clang", this is all Mavericks supports.
  23.  # gcc symlinks may still exist, but they are simply clang with
  24. Index: libraries/osx/build-osx-libs.sh
  25. ===================================================================
  26. --- libraries/osx/build-osx-libs.sh (revision 21914)
  27. +++ libraries/osx/build-osx-libs.sh (working copy)
  28. @@ -516,7 +516,7 @@
  29.    tar -xf $LIB_ARCHIVE
  30.    pushd $LIB_DIRECTORY/nspr
  31.  
  32. -  (CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" && make ${JOBS} && make install) || die "NSPR build failed"
  33. +  (CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix="$NSPR_DIR" --enable-64bit && make ${JOBS} && make install) || die "NSPR build failed"
  34.    popd
  35.    # TODO: how can we not build the dylibs?
  36.    rm -f lib/*.dylib
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement