1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
diff -ur node-v12.2.0/deps/v8/BUILD.gn node-v12.2.0+iPhone/deps/v8/BUILD.gn
--- node-v12.2.0/deps/v8/BUILD.gn 2019-05-07 14:52:14.000000000 +0000
+++ node-v12.2.0+iPhone/deps/v8/BUILD.gn 2019-05-21 18:40:00.282148080 +0000
@@ -3330,7 +3330,7 @@
"dl",
"rt",
]
- if (host_os == "mac") {
+ if (host_os == "mac" or host_os == "ios") {
sources += [
"src/base/debug/stack_trace_posix.cc",
"src/base/platform/platform-macos.cc",
diff -ur node-v12.2.0/deps/v8/DEPS node-v12.2.0+iPhone/deps/v8/DEPS
--- node-v12.2.0/deps/v8/DEPS 2019-05-07 14:52:14.000000000 +0000
+++ node-v12.2.0+iPhone/deps/v8/DEPS 2019-05-21 18:36:28.270234167 +0000
@@ -88,7 +88,7 @@
'version': '2d3358ae9a569b2d4a474f498b32b202a152134f'
},
],
- 'condition': 'host_os == "mac" and checkout_fuchsia',
+ 'condition': '(host_os == "mac" or host_os == "ios") and checkout_fuchsia',
'dep_type': 'cipd',
},
'v8/tools/clang':
@@ -173,7 +173,7 @@
{
'name': 'clang_format_mac',
'pattern': '.',
- 'condition': 'host_os == "mac"',
+ 'condition': 'host_os == "mac" or host_os == "ios"',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=darwin',
@@ -232,7 +232,7 @@
{
'name': 'gn_mac',
'pattern': '.',
- 'condition': 'host_os == "mac"',
+ 'condition': 'host_os == "mac" or host_os == "ios"',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=darwin',
@@ -371,14 +371,14 @@
# Should run after the clang hook.
'name': 'lld/mac',
'pattern': '.',
- 'condition': 'host_os == "mac" and checkout_fuchsia',
+ 'condition': '(host_os == "mac" or host_os == "ios") and checkout_fuchsia',
'action': ['python', 'v8/tools/clang/scripts/download_lld_mac.py'],
},
{
# Mac does not have llvm-objdump, download it for cross builds in Fuchsia.
'name': 'llvm-objdump',
'pattern': '.',
- 'condition': 'host_os == "mac" and checkout_fuchsia',
+ 'condition': '(host_os == "mac" or host_os == "ios") and checkout_fuchsia',
'action': ['python', 'v8/tools/clang/scripts/download_objdump.py'],
},
{
diff -ur node-v12.2.0/deps/v8/snapshot_toolchain.gni node-v12.2.0+iPhone/deps/v8/snapshot_toolchain.gni
--- node-v12.2.0/deps/v8/snapshot_toolchain.gni 2019-05-07 14:52:14.000000000 +0000
+++ node-v12.2.0+iPhone/deps/v8/snapshot_toolchain.gni 2019-05-21 18:39:30.638156761 +0000
@@ -60,7 +60,7 @@
# binaries built for the same OS, so build the snapshot with the current
# toolchain here, too.
v8_snapshot_toolchain = current_toolchain
- } else if (current_os == "win" && host_os == "mac" && is_clang) {
+ } else if ((current_os == "win" || current_os == "ios") && host_os == "mac" && is_clang) {
# This is a mac -> win cross-compile, which is only supported w/ clang.
v8_snapshot_toolchain = "//build/toolchain/mac:clang_${v8_current_cpu}"
} else if (host_cpu == "x64" &&
diff -ur node-v12.2.0/deps/v8/tools/node/build_gn.py node-v12.2.0+iPhone/deps/v8/tools/node/build_gn.py
--- node-v12.2.0/deps/v8/tools/node/build_gn.py 2019-05-07 14:52:15.000000000 +0000
+++ node-v12.2.0+iPhone/deps/v8/tools/node/build_gn.py 2019-05-21 18:37:26.194204650 +0000
@@ -42,7 +42,7 @@
def FindGn(options):
if options.host_os == "linux":
os_path = "linux64"
- elif options.host_os == "mac":
+ elif options.host_os == "mac" or options.host_os == "ios":
os_path = "mac"
elif options.host_os == "win":
os_path = "win"
|
