Title: [267441] trunk
Revision
267441
Author
[email protected]
Date
2020-09-22 15:26:39 -0700 (Tue, 22 Sep 2020)

Log Message

Refactor build rules in Makefiles and Makefile.shared
https://bugs.webkit.org/show_bug.cgi?id=216806
<rdar://problem/69332316>

Reviewed by David Kilzer.

Build fix: Previous change for this bug broke the ability to perform a
build with just `make`, due to that code path invoking
`set-webkit-configuration` with no parameters, which causes that
script to error-out.

* Makefile.shared:

Modified Paths

Diff

Modified: trunk/ChangeLog (267440 => 267441)


--- trunk/ChangeLog	2020-09-22 22:23:08 UTC (rev 267440)
+++ trunk/ChangeLog	2020-09-22 22:26:39 UTC (rev 267441)
@@ -6,6 +6,21 @@
 
         Reviewed by David Kilzer.
 
+        Build fix: Previous change for this bug broke the ability to perform a
+        build with just `make`, due to that code path invoking
+        `set-webkit-configuration` with no parameters, which causes that
+        script to error-out.
+
+        * Makefile.shared:
+
+2020-09-22  Keith Rollin  <[email protected]>
+
+        Refactor build rules in Makefiles and Makefile.shared
+        https://bugs.webkit.org/show_bug.cgi?id=216806
+        <rdar://problem/69332316>
+
+        Reviewed by David Kilzer.
+
         Factor out the common aspects of the build rules in Makefile.shared
         and the various Makefiles. This allows us to more easily see what's
         different between the various build targets, and to apply uniform

Modified: trunk/Makefile.shared (267440 => 267441)


--- trunk/Makefile.shared	2020-09-22 22:23:08 UTC (rev 267440)
+++ trunk/Makefile.shared	2020-09-22 22:26:39 UTC (rev 267441)
@@ -104,7 +104,9 @@
 endef
 
 all:
+ifneq (,$(strip $(ASAN_OPTION) $(TSAN_OPTION) $(WK_LTO_OPTION)))
 	@$(call set_webkit_configuration,)
+endif
 	@$(call invoke_xcode,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)')
 
 debug d development dev develop: force
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to