Title: [183604] trunk
- Revision
- 183604
- Author
- [email protected]
- Date
- 2015-04-29 19:39:45 -0700 (Wed, 29 Apr 2015)
Log Message
REGRESSION(183583): [Mac] make without SDKROOT has issues
https://bugs.webkit.org/show_bug.cgi?id=144431
Reviewed by Dan Bernstein.
.:
* Source/Makefile:
Assume an empty SDKROOT means an macosx variant, so only
enable settings if the SDKROOT is not empty and does not
contain "macosx".
Tools:
* Makefile:
* WebKitTestRunner/Makefile:
Assume an empty SDKROOT means an macosx variant, so only
enable settings if the SDKROOT is not empty and does not
contain "macosx".
Modified Paths
Diff
Modified: trunk/ChangeLog (183603 => 183604)
--- trunk/ChangeLog 2015-04-30 02:10:25 UTC (rev 183603)
+++ trunk/ChangeLog 2015-04-30 02:39:45 UTC (rev 183604)
@@ -1,3 +1,15 @@
+2015-04-29 Joseph Pecoraro <[email protected]>
+
+ REGRESSION(183583): [Mac] make without SDKROOT has issues
+ https://bugs.webkit.org/show_bug.cgi?id=144431
+
+ Reviewed by Dan Bernstein.
+
+ * Source/Makefile:
+ Assume an empty SDKROOT means an macosx variant, so only
+ enable settings if the SDKROOT is not empty and does not
+ contain "macosx".
+
2015-04-29 Martin Robinson <[email protected]>
Fix the GTK+ build after r183584
Modified: trunk/Source/Makefile (183603 => 183604)
--- trunk/Source/Makefile 2015-04-30 02:10:25 UTC (rev 183603)
+++ trunk/Source/Makefile 2015-04-30 02:39:45 UTC (rev 183604)
@@ -1,7 +1,9 @@
MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
-ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
+ifneq (,$(SDKROOT))
+ ifeq (,$(findstring macosx,$(SDKROOT)))
+ MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
+ endif
endif
all:
Modified: trunk/Tools/ChangeLog (183603 => 183604)
--- trunk/Tools/ChangeLog 2015-04-30 02:10:25 UTC (rev 183603)
+++ trunk/Tools/ChangeLog 2015-04-30 02:39:45 UTC (rev 183604)
@@ -1,3 +1,16 @@
+2015-04-29 Joseph Pecoraro <[email protected]>
+
+ REGRESSION(183583): [Mac] make without SDKROOT has issues
+ https://bugs.webkit.org/show_bug.cgi?id=144431
+
+ Reviewed by Dan Bernstein.
+
+ * Makefile:
+ * WebKitTestRunner/Makefile:
+ Assume an empty SDKROOT means an macosx variant, so only
+ enable settings if the SDKROOT is not empty and does not
+ contain "macosx".
+
2015-04-29 Brent Fulgham <[email protected]>
Expand test infrastructure to support scrolling tests
Modified: trunk/Tools/Makefile (183603 => 183604)
--- trunk/Tools/Makefile 2015-04-30 02:10:25 UTC (rev 183603)
+++ trunk/Tools/Makefile 2015-04-30 02:39:45 UTC (rev 183604)
@@ -1,7 +1,9 @@
MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
-ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
+ifneq (,$(SDKROOT))
+ ifeq (,$(findstring macosx,$(SDKROOT)))
+ MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
+ endif
endif
all:
Modified: trunk/Tools/WebKitTestRunner/Makefile (183603 => 183604)
--- trunk/Tools/WebKitTestRunner/Makefile 2015-04-30 02:10:25 UTC (rev 183603)
+++ trunk/Tools/WebKitTestRunner/Makefile 2015-04-30 02:39:45 UTC (rev 183604)
@@ -5,9 +5,11 @@
ifeq "$(BUILD_WEBKITTESTRUNNER)" "YES"
-ifeq (,$(findstring macosx,$(SDKROOT)))
- ifeq (,$(findstring clean,$(MAKECMDGOALS)))
- OTHER_OPTIONS += -target WebKitTestRunnerApp
+ifneq (,$(SDKROOT))
+ ifeq (,$(findstring macosx,$(SDKROOT)))
+ ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ OTHER_OPTIONS += -target WebKitTestRunnerApp
+ endif
endif
endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
