wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 16:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source
This commit is contained in:
Brian Smith 2022-06-10 01:28:08 -05:00 • committed by roytam1
commit 5bf1ed5953
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/ffi.configure
View file

@ -40,9 +40,10 @@ def ffi_target(target):
elif target.os == 'OSX': elif target.os == 'OSX':
if target.cpu == 'aarch64': if target.cpu == 'aarch64':
target_name = 'AARCH64_DARWIN' target_name = 'AARCH64_DARWIN'
target_dir = 'aarch64'
else: else:
target_name = 'X86_DARWIN' target_name = 'X86_DARWIN'
target_dir = 'aarch64' target_dir = 'x86'
elif target.cpu == 'arm': elif target.cpu == 'arm':
target_dir = 'arm' target_dir = 'arm'
target_name = 'ARM' target_name = 'ARM'

1
js/src/aclocal.m4 vendored
View file

@ -25,7 +25,6 @@ builtin(include, ../../build/autoconf/icu.m4)dnl
builtin(include, ../../build/autoconf/clang-plugin.m4)dnl builtin(include, ../../build/autoconf/clang-plugin.m4)dnl
builtin(include, ../../build/autoconf/alloc.m4)dnl builtin(include, ../../build/autoconf/alloc.m4)dnl
builtin(include, ../../build/autoconf/sanitize.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([__MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE]))
define([AC_INIT_PREPARE], define([AC_INIT_PREPARE],