--- a/moz.configure
+++ b/moz.configure
@@ -149,19 +149,19 @@ def is_openbsd(target):
option(env='SO_VERSION', nargs=1, default='1.0', when=is_openbsd,
help='Shared library version for OpenBSD systems')
@depends('SO_VERSION', when=is_openbsd)
def so_version(value):
return value
-@depends(target, target_is_windows, target_is_darwin, c_compiler, so_version)
-def library_name_info(target, is_windows, is_darwin, c_compiler, so_version):
- if is_windows:
+@depends(target, c_compiler, so_version)
+def library_name_info(target, c_compiler, so_version):
+ if target.kernel == 'WINNT':
# There aren't artifacts for mingw builds, so it's OK that the results
# are inaccurate in that case.
if c_compiler and c_compiler.type not in ('msvc', 'clang-cl'):
return namespace(
dll=namespace(prefix='', suffix='.dll'),
lib=namespace(prefix='lib', suffix='a'),
import_lib=namespace(prefix='lib', suffix='a'),
rust_lib=namespace(prefix='', suffix='lib'),
@@ -171,17 +171,17 @@ def library_name_info(target, is_windows
return namespace(
dll=namespace(prefix='', suffix='.dll'),
lib=namespace(prefix='', suffix='lib'),
import_lib=namespace(prefix='', suffix='lib'),
rust_lib=namespace(prefix='', suffix='lib'),
obj=namespace(prefix='', suffix='obj'),
)
- elif is_darwin:
+ elif target.kernel == 'Darwin':
return namespace(
dll=namespace(prefix='lib', suffix='.dylib'),
lib=namespace(prefix='lib', suffix='a'),
import_lib=namespace(prefix=None, suffix=''),
rust_lib=namespace(prefix='lib', suffix='a'),
obj=namespace(prefix='', suffix='o'),
)
elif so_version: