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

Bug 1375798 - Avoid using target_is_windows and target_is_darwin in library_name_info. r=mshal

Browse Source 
We eventually want to templatize the library_name_info function, in
order to have one for host and one for target. So we don't want 3
different dependencies for the target.

--HG--
extra : rebase_source : cc980a5da9a35e71856ef970a58b2edcd05615c6
This commit is contained in:
Mike Hommey 2017-06-23 15:07:54 +09:00
parent 2b86683647
commit a5b9313db8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moz.configure
View File

@ -154,9 +154,9 @@ option(env='SO_VERSION', nargs=1, default='1.0', 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'):
@ -176,7 +176,7 @@ def library_name_info(target, is_windows, is_darwin, c_compiler, so_version):
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'),