diff options
| author | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-12-30 05:56:55 -0500 |
|---|---|---|
| committer | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-12-30 05:56:55 -0500 |
| commit | 23af36d99ea59d934c38ca8a69536119c49bac7f (patch) | |
| tree | 89b2ea6ee3a134e174f88cbd47887f54fe279237 /deps | |
| parent | 2c8751cb855af0b93a92286e82c0c1ca4fd3bfdc (diff) | |
| download | ios-node-v8-23af36d99ea59d934c38ca8a69536119c49bac7f.tar.gz ios-node-v8-23af36d99ea59d934c38ca8a69536119c49bac7f.tar.bz2 ios-node-v8-23af36d99ea59d934c38ca8a69536119c49bac7f.zip | |
add build rules for ios arm64
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/cares/cares.gyp | 4 | ||||
| -rw-r--r-- | deps/uv/src/unix/darwin.c | 4 | ||||
| -rw-r--r-- | deps/v8/BUILD.gn | 1 | ||||
| -rw-r--r-- | deps/v8/src/wasm/code-space-access.h | 2 | ||||
| -rw-r--r-- | deps/v8/src/wasm/wasm-code-manager.cc | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp index 0dc4ff9317..6ec84df47d 100644 --- a/deps/cares/cares.gyp +++ b/deps/cares/cares.gyp @@ -158,6 +158,10 @@ 'include_dirs': [ 'config/darwin' ], 'sources': [ 'config/darwin/ares_config.h' ] }], + [ 'OS=="ios"', { + 'include_dirs': [ 'config/darwin' ], + 'sources': [ 'config/darwin/ares_config.h' ] + }], [ 'OS=="freebsd" or OS=="dragonflybsd"', { 'include_dirs': [ 'config/freebsd' ], 'sources': [ 'config/freebsd/ares_config.h' ] diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c index d0ecd452d8..8ef12362f8 100644 --- a/deps/uv/src/unix/darwin.c +++ b/deps/uv/src/unix/darwin.c @@ -33,9 +33,9 @@ #include <sys/sysctl.h> #include <unistd.h> /* sysconf */ -#if !TARGET_OS_IPHONE +//#if !TARGET_OS_IPHONE #include "darwin-stub.h" -#endif +//#endif static uv_once_t once = UV_ONCE_INIT; static uint64_t (*time_func)(void); diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn index 94b598bc9a..353588088d 100644 --- a/deps/v8/BUILD.gn +++ b/deps/v8/BUILD.gn @@ -893,6 +893,7 @@ config("toolchain") { if (is_clang) { cflags += [ "-Wmissing-field-initializers" ] + cflags += [ "-Wno-error" ] if (v8_current_cpu != "mips" && v8_current_cpu != "mipsel") { # We exclude MIPS because the IsMipsArchVariant macro causes trouble. diff --git a/deps/v8/src/wasm/code-space-access.h b/deps/v8/src/wasm/code-space-access.h index 5eeb980e17..1f066a9103 100644 --- a/deps/v8/src/wasm/code-space-access.h +++ b/deps/v8/src/wasm/code-space-access.h @@ -12,7 +12,7 @@ namespace v8 { namespace internal { -#if defined(V8_OS_MACOSX) && defined(V8_HOST_ARCH_ARM64) +#if defined(V8_OS_MACOSX) && defined(V8_HOST_ARCH_ARM64) && !defined(V8_OS_IOS) // Ignoring this warning is considered better than relying on // __builtin_available. diff --git a/deps/v8/src/wasm/wasm-code-manager.cc b/deps/v8/src/wasm/wasm-code-manager.cc index ac68dc970c..3a34ede56a 100644 --- a/deps/v8/src/wasm/wasm-code-manager.cc +++ b/deps/v8/src/wasm/wasm-code-manager.cc @@ -49,7 +49,7 @@ namespace wasm { using trap_handler::ProtectedInstructionData; -#if defined(V8_OS_MACOSX) && defined(V8_HOST_ARCH_ARM64) +#if defined(V8_OS_MACOSX) && defined(V8_HOST_ARCH_ARM64) && !defined(V8_OS_IOS) thread_local int CodeSpaceWriteScope::code_space_write_nesting_level_ = 0; #endif |