|
1 | 1 | diff --git forkSrcPrefix/osdep/mac/meson.build forkDstPrefix/osdep/mac/meson.build |
2 | | -index d886e5406a03ad2d46171aba5fb4c56840aac4a8..aebee946a795b39834ffdd558810ef0761392b16 100644 |
| 2 | +index 16605288419c54cb9d89680a6fafd6a2f315487e..a154dea05ea77243f760a05067ead7f32623b991 100644 |
3 | 3 | --- forkSrcPrefix/osdep/mac/meson.build |
4 | 4 | +++ forkDstPrefix/osdep/mac/meson.build |
5 | | -@@ -2,8 +2,8 @@ |
6 | | - bridge = join_paths(source_root, 'osdep/mac/app_bridge_objc.h') |
7 | | - module = join_paths(build_root, 'osdep/mac/swift.swiftmodule') |
| 5 | +@@ -6,12 +6,12 @@ swift_flags = ['-c', '-emit-library', '-static', '-sdk', macos_sdk_path, |
| 6 | + '-emit-objc-header', '-parse-as-library'] |
8 | 7 |
|
9 | | --swift_flags = ['-c', '-emit-library', '-static', '-sdk', macos_sdk_path, |
10 | | -- '-emit-objc-header', '-parse-as-library'] |
11 | | -+swift_flags = ['-frontend', '-c', '-sdk', macos_sdk_path, |
12 | | -+ '-enable-objc-interop', '-emit-objc-header', '-parse-as-library'] |
| 8 | + # fallback to old swift frontend build |
| 9 | +-if swift_ver.version_compare('<5.8') |
| 10 | ++#if swift_ver.version_compare('<5.8') |
| 11 | + message('Falling back to old swift frontend build') |
| 12 | + swift_prog = find_program(run_command(xcrun, '-find', 'swift', check: true).stdout().strip()) |
| 13 | + swift_flags = ['-frontend', '-c', '-sdk', macos_sdk_path, |
| 14 | + '-enable-objc-interop', '-emit-objc-header', '-parse-as-library'] |
| 15 | +-endif |
| 16 | ++#endif |
13 | 17 |
|
14 | 18 | if swift_ver.version_compare('>=6.0') |
15 | 19 | swift_flags += ['-swift-version', '5'] |
0 commit comments