Add missing --osx-sdk and --osx-version-min options

- Add missing `--osx-version-min` option to the iOS AOT compiler script.
- Add missing `--osx-sdk` and `--osx-version-min` options to the macOS desktop script.
- Use xcrun to get macosx sdk path in the macOS desktop script. Previously the path was hard-coded. This matches the iOS script.

.github/workflows/build.yml

@@ -27,7 +27,7 @@ on:
 
 env:
   # Use SHA or tag instead of the branch for caching purposes.
-  MONO_TAG: mono-6.12.0.144
+  MONO_TAG: mono-6.12.0.147
   PYTHON_VERSION: 3.9
   # Should match the version that Mono supports.
   EMSDK_VERSION: 1.39.9
@@ -65,7 +65,7 @@ jobs:
           sudo apt-get -y install git autoconf libtool libtool-bin automake build-essential gettext cmake python3 curl
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -139,7 +139,7 @@ jobs:
           sudo apt-get -y install mingw-w64 libz-mingw-w64-dev
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -203,7 +203,7 @@ jobs:
           brew install autoconf automake libtool pkg-config cmake python3
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -257,7 +257,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        target: [arm64, x86_64]
+        target: [arm64, x86_64, arm64-sim]
     steps:
       - name: Set Environment Variables
         run: |
@@ -267,7 +267,7 @@ jobs:
           brew install autoconf automake libtool pkg-config cmake python3
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -337,7 +337,7 @@ jobs:
           brew install autoconf automake libtool pkg-config cmake python3
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -435,7 +435,7 @@ jobs:
           echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION" >> $GITHUB_ENV
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -564,7 +564,7 @@ jobs:
           echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION" >> $GITHUB_ENV
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -651,7 +651,7 @@ jobs:
           sudo apt-get -y install git autoconf libtool libtool-bin automake build-essential gettext cmake python3 curl
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -674,7 +674,7 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Setup Emscripten SDK
-        uses: mymindstorm/setup-emsdk@v9
+        uses: mymindstorm/setup-emsdk@v10
         with:
           version: ${{ env.EMSDK_VERSION }}
       - name: Patch Mono
@@ -724,7 +724,7 @@ jobs:
     steps:
       - name: Cache LLVM
         id: cache_llvm
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ~/mono-installs/llvm-${{ matrix.target }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-llvm-${{ matrix.target }}
@@ -747,7 +747,7 @@ jobs:
       - name: Cache Mono Sources
         if: steps.cache_llvm.outputs.cache-hit != 'true'
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources
@@ -811,7 +811,7 @@ jobs:
           sudo apt-get -y install git autoconf libtool libtool-bin automake build-essential gettext cmake python3 curl
       - name: Cache Mono Sources
         id: cache_mono_sources
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ env.MONO_SOURCE_ROOT }}
           key: ${{ runner.os }}-${{ env.MONO_TAG }}-mono-sources

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
 *.pyc
+.DS_Store

README.md

@@ -9,7 +9,7 @@ This repository contains scripts for building the Mono runtime to use with Godot
 The scripts are tested against specific versions of the toolchains used by Godot.
 While they may work with other versions, you might have issues applying patches or compiling, so we recommend using the versions below.
 
-- Mono: 6.12.0.144.
+- Mono: 6.12.0.147.
 - Emscripten: 1.39.9.
 - Android: API level 29.
 

bcl.py

@@ -178,6 +178,25 @@ def make_product(opts: BclOpts, product: str):
 
         run_command('csc', android_env_csc_args)
 
+    # (custom 'Xamarin.iOS.dll')
+    if product == 'ios':
+        this_script_dir = os.path.dirname(os.path.realpath(__file__))
+        monotouch_profile_dir = '%s/%s' % (install_dir, 'monotouch')
+        refs = ['mscorlib.dll', 'System.Net.Http.dll']
+
+        mkdir_p(monotouch_profile_dir)
+
+        android_env_csc_args = [
+            path_join(this_script_dir, 'files', 'xi.cs'),
+            '-keyfile:' + path_join(this_script_dir, 'files', 'xi.snk'),
+            '-out:%s' % path_join(monotouch_profile_dir, 'Xamarin.iOS.dll'),
+            '-optimize', '-deterministic', '-publicsign', '-target:library',
+            '-nostdlib', '-noconfig', '-langversion:latest'
+        ]
+        android_env_csc_args += ['-r:%s' % path_join(monotouch_profile_dir, r) for r in refs]
+
+        run_command('csc', android_env_csc_args)
+
 
 def clean_product(opts: BclOpts, product: str):
     clean_bcl(opts)

desktop.py

@@ -15,7 +15,7 @@ import runtime
 targets = {
     'linux': ['x86', 'x86_64'],
     'windows': ['x86', 'x86_64'],
-    'osx': ['x86_64']
+    'osx': ['arm64', 'x86_64']
 }
 
 target_arch = {
@@ -28,14 +28,24 @@ target_arch = {
         'x86_64': 'x86_64'
     },
     'osx': {
+        'arm64': 'arm64',
         'x86_64': 'x86_64'
     }
 }
 
 host_triples = {
-    'linux': '%s-linux-gnu',
-    'windows': '%s-w64-mingw32',
-    'osx': '%s-apple-darwin',
+    'linux': {
+        'x86': 'i686-linux-gnu',
+        'x86_64': 'x86_64-linux-gnu'
+    },
+    'windows': {
+        'x86': 'i686-w64-mingw32',
+        'x86_64': 'x86_64-w64-mingw32'
+    },
+    'osx': {
+        'arm64': 'aarch64-apple-darwin20',
+        'x86_64': 'x86_64-apple-darwin'
+    }
 }
 
 llvm_table = {
@@ -70,7 +80,7 @@ def get_osxcross_sdk(osxcross_bin, arch):
 
 
 def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_platform: str, target: str):
-    host_triple = host_triples[target_platform] % target_arch[target_platform][target]
+    host_triple = host_triples[target_platform][target]
 
     CONFIGURE_FLAGS = [
         '--disable-boehm',
@@ -113,6 +123,16 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl
             #'--enable-static-gcc-libs'
         ]
     elif target_platform == 'osx':
+        osx_sysroot_path = opts.osx_sdk_path
+
+        if not osx_sysroot_path and sys.platform == 'darwin':
+            # Auto-detect on macOS
+            osx_sysroot_path = xcrun_find_sdk('macosx')
+
+        osx_sysroot_flags = ['-isysroot', osx_sysroot_path, '-mmacosx-version-min=%s' % opts.osx_version_min]
+
+        CFLAGS = osx_sysroot_flags
+
         if is_cross_compiling(target_platform):
             osxcross_root = os.environ['OSXCROSS_ROOT']
             osx_toolchain_path = path_join(osxcross_root, 'target')
@@ -137,7 +157,15 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl
             # DTrace is not available when building with OSXCROSS
             CONFIGURE_FLAGS += ['--enable-dtrace=no']
         else:
-            env['_%s-%s_CC' % (product, target)] = 'cc'
+            osx_toolchain = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'
+
+            env['_%s-%s_CC' % (product, target)] = '%s/usr/bin/clang' % osx_toolchain
+            env['_%s-%s_CXX' % (product, target)] = '%s/usr/bin/clang++' % osx_toolchain
+
+            CFLAGS += ['-arch', target_arch[target_platform][target]]
+
+        env['_%s-%s_CFLAGS' % (product, target)] = CFLAGS
+        env['_%s-%s_CXXFLAGS' % (product, target)] = CFLAGS
 
     env['_%s-%s_CONFIGURE_FLAGS' % (product, target)] = CONFIGURE_FLAGS
 
@@ -230,9 +258,13 @@ def run_main(raw_args, target_platform):
 
     default_help = 'default: %(default)s'
 
+    default_osx_version_min = '10.9'
+
     parser.add_argument('action', choices=['configure', 'make', 'copy-bcl', 'clean'])
     parser.add_argument('--target', choices=targets[target_platform], action='append', required=True)
     parser.add_argument('--with-llvm', action='store_true', default=False, help=default_help)
+    parser.add_argument('--osx-sdk', default='', help=default_help)
+    parser.add_argument('--osx-version-min', default=default_osx_version_min, help=default_help)
 
     cmd_utils.add_runtime_arguments(parser, default_help)
 

files/xi.cs

@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+[assembly:System.Reflection.AssemblyVersionAttribute ("0.0.0.0")]
+[assembly:System.Runtime.CompilerServices.InternalsVisibleTo ("System.Net.Http, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+
+namespace ObjCRuntime
+{
+    internal class RuntimeOptions
+    {
+        internal static HttpMessageHandler GetHttpMessageHandler()
+        {
+            return new HttpClientHandler();
+        }
+    }
+}

ios.py

@@ -14,7 +14,7 @@ import runtime
 this_script_dir = os.path.dirname(os.path.realpath(__file__))
 
 device_targets = ['armv7', 'arm64']
-sim_targets = ['i386', 'x86_64']
+sim_targets = ['i386', 'x86_64', 'arm64-sim']
 cross_targets = ['cross-armv7', 'cross-arm64']
 
 
@@ -26,6 +26,7 @@ class iOSTargetTable:
     archs = {
         'armv7': 'arm',
         'arm64': 'arm64',
+        'arm64-sim': 'arm64',
         'i386': 'i386',
         'x86_64': 'x86_64'
     }
@@ -33,6 +34,7 @@ class iOSTargetTable:
     host_triples = {
         'armv7': 'arm-apple-darwin11',
         'arm64': 'aarch64-apple-darwin11',
+        'arm64-sim': 'aarch64-apple-darwin11',
         'i386': 'i386-apple-darwin11',
         'x86_64': 'x86_64-apple-darwin11'
     }
@@ -40,6 +42,7 @@ class iOSTargetTable:
     osxcross_tool_triples = {
         'armv7': 'arm-apple-darwin11', # TODO: ?
         'arm64': 'arm-apple-darwin11',
+        'arm64-sim': 'arm-apple-darwin11',
         'i386': 'i386-apple-darwin11', # TODO: ?
         'x86_64': 'x86_64-apple-darwin11'
     }
@@ -185,7 +188,7 @@ def setup_ios_simulator_template(env: dict, opts: iOSOpts, target: str):
     if not ios_sysroot_path:
         raise RuntimeError('Cannot find iOS SDK; specify one manually with \'--ios-sdk\'.')
 
-    sysroot_flags = ['-isysroot', ios_sysroot_path, '-miphoneos-version-min=%s' % opts.ios_version_min]
+    sysroot_flags = ['-isysroot', ios_sysroot_path, '-mios-simulator-version-min=%s' % opts.ios_version_min]
 
     arch = iOSTargetTable.archs[target]
     host_triple = iOSTargetTable.host_triples[target]
@@ -306,8 +309,11 @@ class iOSCrossTable:
     }
 
 
-def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: str):
+def llvm_for(host_arch: str) -> str:
+    return 'llvmarm64' if host_arch == 'arm64' else 'llvm64'
 
+
+def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: str):
     target_triple = iOSCrossTable.target_triples[target]
     device_target = iOSCrossTable.device_targets[target]
     offsets_dumper_abi = iOSCrossTable.offsets_dumper_abis[target]
@@ -384,8 +390,10 @@ def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: s
 
     AC_VARS = ['ac_cv_func_shm_open_working_with_mmap=no']
 
-    CFLAGS = ['-isysroot', osx_sysroot_path, '-mmacosx-version-min=10.9', '-Qunused-arguments']
-    CXXFLAGS = ['-isysroot', osx_sysroot_path, '-mmacosx-version-min=10.9', '-Qunused-arguments', '-stdlib=libc++']
+    osx_sysroot_flags = ['-isysroot', osx_sysroot_path, '-mmacosx-version-min=%s' % opts.osx_version_min]
+
+    CFLAGS = osx_sysroot_flags + ['-Qunused-arguments']
+    CXXFLAGS = osx_sysroot_flags + ['-Qunused-arguments', '-stdlib=libc++']
     CPPFLAGS = ['-DMONOTOUCH=1']
     LDFLAGS = ['-stdlib=libc++']
 
@@ -411,7 +419,7 @@ def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: s
     env['_ios-%s_CONFIGURE_FLAGS' % target] = CONFIGURE_FLAGS
 
     # Runtime cross template
-    runtime.setup_runtime_cross_template(env, opts, 'ios', target, host_triple, target_triple, device_target, 'llvm64', offsets_dumper_abi)
+    runtime.setup_runtime_cross_template(env, opts, 'ios', target, host_triple, target_triple, device_target, llvm_for(host_arch), offsets_dumper_abi)
 
 
 def strip_libs(opts: iOSOpts, product: str, target: str):
@@ -427,8 +435,11 @@ def configure(opts: iOSOpts, product: str, target: str):
     if is_cross(target):
         import llvm
 
-        llvm.make(opts, 'llvm64')
-        setup_ios_cross_template(env, opts, target, host_arch='x86_64')
+        host_arch='x86_64'
+
+        llvm.make(opts, llvm_for(host_arch))
+
+        setup_ios_cross_template(env, opts, target, host_arch)
     else:
         if is_sim:
             setup_ios_simulator_template(env, opts, target)
@@ -491,7 +502,8 @@ def main(raw_args):
 
     default_ios_toolchain = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'
     default_osx_toolchain = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'
-    default_ios_version_min = '10.0' # Same as Godot
+    default_ios_version_min = '10.0'
+    default_osx_version_min = '10.9'
 
     parser.add_argument('action', choices=['configure', 'make', 'clean'])
     parser.add_argument('--target', choices=target_values, action='append', required=True)
@@ -500,6 +512,7 @@ def main(raw_args):
     parser.add_argument('--ios-version-min', default=default_ios_version_min, help=default_help)
     parser.add_argument('--osx-toolchain', default=default_osx_toolchain, help=default_help)
     parser.add_argument('--osx-sdk', default='', help=default_help)
+    parser.add_argument('--osx-version-min', default=default_osx_version_min, help=default_help)
     parser.add_argument('--osx-triple-abi', default='darwin18', help=default_help)
 
     cmd_utils.add_runtime_arguments(parser, default_help)

llvm.py

@@ -11,7 +11,7 @@ from os_utils import *
 # TODO: OSXCROSS
 
 
-target_values = ['llvm32', 'llvm64', 'llvmwin32', 'llvmwin64']
+target_values = ['llvm32', 'llvm64', 'llvmarm64', 'llvmwin32', 'llvmwin64']
 mxe_targets = {
     'llvmwin32': {'arch': 'i686', 'mxe': 'mxe-Win32'},
     'llvmwin64': {'arch': 'x86_64', 'mxe': 'mxe-Win64'}

options.py

@@ -38,12 +38,15 @@ class iOSOpts(RuntimeOpts):
     ios_version_min: str
     osx_toolchain_path: str
     osx_sdk_path: str
+    osx_version_min: str
     osx_triple_abi: str
 
 
 @dataclass
 class DesktopOpts(RuntimeOpts):
     with_llvm: bool
+    osx_sdk_path: str
+    osx_version_min: str
 
 
 @dataclass
@@ -95,7 +98,8 @@ def ios_opts_from_args(args):
         ios_sdk_path = abspath(args.ios_sdk) if args.ios_sdk else '',
         ios_version_min = args.ios_version_min,
         osx_toolchain_path = abspath(args.osx_toolchain),
-        osx_sdk_path = abspath(args.osx_sdk) if args.ios_sdk else '',
+        osx_sdk_path = abspath(args.osx_sdk) if args.osx_sdk else '',
+        osx_version_min = args.osx_version_min,
         osx_triple_abi = args.osx_triple_abi
     )
 
@@ -111,7 +115,9 @@ def bcl_opts_from_args(args):
 def desktop_opts_from_args(args):
     return DesktopOpts(
         **vars(runtime_opts_from_args(args)),
-        with_llvm = args.with_llvm
+        with_llvm = args.with_llvm,
+        osx_sdk_path = abspath(args.osx_sdk) if args.osx_sdk else '',
+        osx_version_min = args.osx_version_min
     )