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

Fix issue in toolchain.configure

Browse source
This commit is contained in:
wuggy 2026-06-25 23:02:55 -07:00
commit 603543d555
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build/moz.configure/toolchain.configure
View file

@ -61,7 +61,6 @@ set_config('HAVE_YASM', have_yasm)
# Until the YASM variable is not necessary in old-configure. # Until the YASM variable is not necessary in old-configure.
add_old_configure_assignment('YASM', have_yasm) add_old_configure_assignment('YASM', have_yasm)
<<<<<<< HEAD
# Android NDK # Android NDK
# ============================================================== # ==============================================================
@ -70,7 +69,6 @@ def compiling_android(compile_env, build_project, gonkdir, _):
return compile_env and (gonkdir or build_project in ('mobile/android', 'js')) return compile_env and (gonkdir or build_project in ('mobile/android', 'js'))
include('android-ndk.configure', when=compiling_android) include('android-ndk.configure', when=compiling_android)
=======
# nasm detection # nasm detection
# ============================================================== # ==============================================================
nasm = check_prog('NASM', ['nasm'], allow_missing=True) nasm = check_prog('NASM', ['nasm'], allow_missing=True)
@ -108,7 +106,6 @@ def nasm_asflags(have_nasm, target):
return asflags return asflags
set_config('NASM_ASFLAGS', nasm_asflags) set_config('NASM_ASFLAGS', nasm_asflags)
>>>>>>> 2d3d34f993 (Enable dav1d SIMD on more architectures)
# MacOS deployment target version # MacOS deployment target version
# ============================================================== # ==============================================================