Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1907031 - Move JS_CONFIG_MOZ_JS_LIBS from old-configure to moz.configure r=glandium

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D216161
This commit is contained in:
serge-sans-paille 2024-08-17 20:36:00 +00:00
parent f67a80bbc5
commit f29ce02b05
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/moz.configure
View File

@ -1547,6 +1547,17 @@ def js_config_libs(nspr_libs, nspr_pkg_libs, instruments):
set_config("JS_CONFIG_LIBS", js_config_libs)
@depends(js_library_name, c_compiler, "--libdir", when=compile_environment)
def js_config_moz_js_libs(js_library_name, compiler, libdir):
if compiler.type == "clang-cl":
return [f"{libdir[0]}/{js_library_name}.lib"]
else:
return [f"-L{libdir[0]}", f"-l{js_library_name}"]
set_config("JS_CONFIG_MOZ_JS_LIBS", js_config_moz_js_libs)
#
# Checks for library functions
# ==============================================================

11
js/src/old-configure.in
View File

@ -34,17 +34,6 @@ if test -n "$MOZ_DEV_EDITION"; then
AC_DEFINE(MOZ_DEV_EDITION)
fi
dnl ========================================================
dnl JavaScript shell
dnl ========================================================
if test "$CC_TYPE" != clang-cl ; then
JS_CONFIG_MOZ_JS_LIBS='-L${libdir} -l${JS_LIBRARY_NAME}'
else
JS_CONFIG_MOZ_JS_LIBS='${libdir}/${JS_LIBRARY_NAME}.lib'
fi
AC_SUBST(JS_CONFIG_MOZ_JS_LIBS)
dnl Spit out some output
dnl ========================================================
MOZ_CREATE_CONFIG_STATUS()