Title: [224372] trunk
- Revision
- 224372
- Author
- [email protected]
- Date
- 2017-11-02 19:50:59 -0700 (Thu, 02 Nov 2017)
Log Message
Reduce duplication in the toplevel Makefile
https://bugs.webkit.org/show_bug.cgi?id=179204
Unreviewed build fix.
* Source/Makefile:
Take three. An empty SDKROOT should be like Mac (and build all the things).
Modified Paths
Diff
Modified: trunk/ChangeLog (224371 => 224372)
--- trunk/ChangeLog 2017-11-03 02:33:25 UTC (rev 224371)
+++ trunk/ChangeLog 2017-11-03 02:50:59 UTC (rev 224372)
@@ -3,7 +3,17 @@
Reduce duplication in the toplevel Makefile
https://bugs.webkit.org/show_bug.cgi?id=179204
+ Unreviewed build fix.
+
* Source/Makefile:
+ Take three. An empty SDKROOT should be like Mac (and build all the things).
+
+2017-11-02 Tim Horton <[email protected]>
+
+ Reduce duplication in the toplevel Makefile
+ https://bugs.webkit.org/show_bug.cgi?id=179204
+
+ * Source/Makefile:
Address some post-landing review comments to keep the order of the MODULES correct.
2017-11-02 Tim Horton <[email protected]>
Modified: trunk/Source/Makefile (224371 => 224372)
--- trunk/Source/Makefile 2017-11-03 02:33:25 UTC (rev 224371)
+++ trunk/Source/Makefile 2017-11-03 02:50:59 UTC (rev 224372)
@@ -1,24 +1,21 @@
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE
+LIBWEBRTC_MODULE =
+WEBINSPECTORUI_MODULE =
ifneq (,$(SDKROOT))
ifneq (,$(findstring iphone,$(SDKROOT)))
- MODULES += ThirdParty/libwebrtc
+ LIBWEBRTC_MODULE = ThirdParty/libwebrtc
endif
ifneq (,$(findstring macosx,$(SDKROOT)))
- MODULES += ThirdParty/libwebrtc
+ LIBWEBRTC_MODULE = ThirdParty/libwebrtc
+ WEBINSPECTORUI_MODULE = WebInspectorUI
endif
+else
+ LIBWEBRTC_MODULE = ThirdParty/libwebrtc
+ WEBINSPECTORUI_MODULE = WebInspectorUI
endif
-MODULES += WebCore
+MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE $(LIBWEBRTC_MODULE) WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
-ifneq (,$(SDKROOT))
- ifneq (,$(findstring macosx,$(SDKROOT)))
- MODULES += WebInspectorUI
- endif
-endif
-
-MODULES += WebKitLegacy WebKit
-
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
