diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-06-10 01:28:08 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-06-10 01:28:08 -0500 |
| commit | 0828fe12326259cb167825975798b19c9cf08147 (patch) | |
| tree | 65f5a4265c1fd216e13b42fd1c796f643daaa3e5 | |
| parent | a977ba55eb80984b38c8f9a31778c948afa55c20 (diff) | |
| download | uxp-0828fe12326259cb167825975798b19c9cf08147.tar.gz | |
Issue #1905 - Part 3h - Fix breakages on other platforms.
Mac Intel broke due to incorrect FFI target_dir for Intel.
Linux and possibly other platforms use a secondary aclocal.m4 that still referenced ios.m4.
| -rw-r--r-- | js/ffi.configure | 3 | ||||
| -rw-r--r-- | js/src/aclocal.m4 | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/ffi.configure b/js/ffi.configure index 749b5f7010..96b6ad6d69 100644 --- a/js/ffi.configure +++ b/js/ffi.configure @@ -40,9 +40,10 @@ def ffi_target(target): elif target.os == 'OSX': if target.cpu == 'aarch64': target_name = 'AARCH64_DARWIN' + target_dir = 'aarch64' else: target_name = 'X86_DARWIN' - target_dir = 'aarch64' + target_dir = 'x86' elif target.cpu == 'arm': target_dir = 'arm' target_name = 'ARM' diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4 index 8b29b284d5..22c0911873 100644 --- a/js/src/aclocal.m4 +++ b/js/src/aclocal.m4 @@ -25,7 +25,6 @@ builtin(include, ../../build/autoconf/icu.m4)dnl builtin(include, ../../build/autoconf/clang-plugin.m4)dnl builtin(include, ../../build/autoconf/alloc.m4)dnl builtin(include, ../../build/autoconf/sanitize.m4)dnl -builtin(include, ../../build/autoconf/ios.m4)dnl define([__MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE])) define([AC_INIT_PREPARE], |