wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1249167 - Fix dependencies involving stdc++compat and clang-plugin. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2016-02-18 09:03:01 +09:00
parent 798482b96e
commit bed0e35451
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/templates.mozbuild
View File

@ -90,10 +90,16 @@ def HostStdCppCompat():
@template @template
def HostProgram(name): def HostProgram(name, c_only=False):
'''Template for build tools executables.''' '''Template for build tools executables.'''
HOST_PROGRAM = name HOST_PROGRAM = name
# With context-based templates, this won't be needed anymore, and will
# work better than relying on the caller setting it, but at the moment,
# this is the best we have. And it doesn't matter /that/ much, so there's
# really only one place using this, where it does matter to avoid the
# extra dependency (because it creates a circular one).
if not c_only:
HostStdCppCompat() HostStdCppCompat()

5
config/moz.build
View File

@ -24,7 +24,10 @@ if CONFIG['HOST_OS_ARCH'] != 'WINNT':
'nsinstall.c', 'nsinstall.c',
'pathsub.c', 'pathsub.c',
] ]
HostProgram('nsinstall_real') # stdc++compat depends on config/export, so avoid a circular
# dependency added by HostProgram depending on stdc++compat,
# while the program here is in C.
HostProgram('nsinstall_real', c_only=True)
if CONFIG['MOZ_SHARED_ICU']: if CONFIG['MOZ_SHARED_ICU']:
DEFINES['MOZ_SHARED_ICU'] = True DEFINES['MOZ_SHARED_ICU'] = True

5
config/recurse.mk
View File

@ -152,7 +152,7 @@ widget/android/bindings/export: build/annotationProcessors/export
mobile/android/tests/browser/robocop/roboextender/tools: mobile/android/tests/javaaddons/tools mobile/android/tests/browser/robocop/roboextender/tools: mobile/android/tests/javaaddons/tools
ifdef ENABLE_CLANG_PLUGIN ifdef ENABLE_CLANG_PLUGIN
$(filter-out build/clang-plugin/%,$(compile_targets)): build/clang-plugin/target build/clang-plugin/tests/target $(filter-out config/host build/unix/stdc++compat/% build/clang-plugin/%,$(compile_targets)): build/clang-plugin/target build/clang-plugin/tests/target
build/clang-plugin/tests/target: build/clang-plugin/target build/clang-plugin/tests/target: build/clang-plugin/target
endif endif
@ -176,3 +176,6 @@ endif
# happen at the same time (bug #1146738) # happen at the same time (bug #1146738)
js/src/target: js/src/host js/src/target: js/src/host
endif endif
# Most things are built during compile (target/host), but some things happen during export
# Those need to depend on config/export for system wrappers.
$(addprefix build/unix/stdc++compat/,target host) build/clang-plugin/target: config/export