|
@@ -2,7 +2,7 @@
|
|
|
# User Mike Hommey <mh+mozilla@glandium.org>
|
|
|
# Date 1566390342 0
|
|
|
# Node ID 51bf6a97396d96ddb82fa91c2cf9bd9f5bc9ae06
|
|
|
-# Parent 4096cc17a03e213a3e13580a6b28c385a62b9a5e
|
|
|
+# Parent f203f966e3335d4ca07cb32884837a685494ccee
|
|
|
Bug 1575420 - Replace MOZ_WIDGET_TOOLKIT value of "gtk3" with "gtk". r=froydnj
|
|
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D42765
|
|
@@ -579,7 +579,7 @@ diff --git a/chrome/moz.build b/chrome/moz.build
|
|
|
diff --git a/config/recurse.mk b/config/recurse.mk
|
|
|
--- a/config/recurse.mk
|
|
|
+++ b/config/recurse.mk
|
|
|
-@@ -171,17 +171,17 @@ xpcom/xpidl/export: xpcom/idl-parser/xpi
|
|
|
+@@ -171,15 +171,15 @@ xpcom/xpidl/export: xpcom/idl-parser/xpi
|
|
|
|
|
|
ifdef ENABLE_CLANG_PLUGIN
|
|
|
$(filter-out config/host build/unix/stdc++compat/% build/clang-plugin/%,$(compile_targets)): build/clang-plugin/host build/clang-plugin/tests/target
|
|
@@ -592,12 +592,10 @@ diff --git a/config/recurse.mk b/config/recurse.mk
|
|
|
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
|
|
|
toolkit/library/target: widget/gtk/mozgtk/gtk3/target
|
|
|
endif
|
|
|
- ifdef MOZ_LDAP_XPCOM
|
|
|
- ldap/target: security/target mozglue/build/target
|
|
|
- toolkit/library/target: ldap/target
|
|
|
- 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/host: config/export
|
|
|
diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
|
|
|
--- a/dom/geolocation/moz.build
|
|
|
+++ b/dom/geolocation/moz.build
|
|
@@ -768,7 +766,7 @@ diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
|
|
|
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
|
|
|
--- a/gfx/cairo/cairo/src/moz.build
|
|
|
+++ b/gfx/cairo/cairo/src/moz.build
|
|
|
-@@ -68,17 +68,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] in {'c
|
|
|
+@@ -64,17 +64,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] in {'c
|
|
|
]
|
|
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
|
|
|
EXPORTS.cairo += [
|
|
@@ -834,7 +832,7 @@ diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
|
|
|
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
|
|
|
--- a/gfx/skia/generate_mozbuild.py
|
|
|
+++ b/gfx/skia/generate_mozbuild.py
|
|
|
-@@ -143,21 +143,21 @@ if CONFIG['CC_TYPE'] == 'gcc':
|
|
|
+@@ -144,21 +144,21 @@ if CONFIG['CC_TYPE'] == 'gcc':
|
|
|
if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
|
|
|
CXXFLAGS += [
|
|
|
'-Wno-implicit-fallthrough',
|
|
@@ -858,7 +856,7 @@ diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
|
|
|
|
|
|
import json
|
|
|
|
|
|
-@@ -447,17 +447,17 @@ def write_mozbuild(sources):
|
|
|
+@@ -448,17 +448,17 @@ def write_mozbuild(sources):
|
|
|
write_sources(f, sources['gpu'], 4)
|
|
|
|
|
|
f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':\n")
|
|
@@ -1337,7 +1335,7 @@ diff --git a/netwerk/protocol/moz.build b/netwerk/protocol/moz.build
|
|
|
diff --git a/old-configure.in b/old-configure.in
|
|
|
--- a/old-configure.in
|
|
|
+++ b/old-configure.in
|
|
|
-@@ -1774,17 +1774,17 @@ dnl there are a lot of tests on MOZ_ENAB
|
|
|
+@@ -1794,17 +1794,17 @@ dnl there are a lot of tests on MOZ_ENAB
|
|
|
dnl to keep that way than testing against MOZ_WIDGET_TOOLKIT
|
|
|
case "$MOZ_WIDGET_TOOLKIT" in
|
|
|
gtk*)
|