[Xcode, iOS] Files are recompiled when alternating between using make and the Xcode IDE

https://bugs.webkit.org/show_bug.cgi?id=140339

Reviewed by Mark Rowe.

* Makefile.shared: Run xcodebuild with the same PATH with which the Xcode IDE runs. This
prevents unnecessary rebuilding due to PATH differences.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@178241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a885f35fcd6dbf87b29b5e291c9fba74eb20b0b8..876343e0f759b5a41a169c9443c7a267f7749493 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-10  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode, iOS] Files are recompiled when alternating between using make and the Xcode IDE
+        https://bugs.webkit.org/show_bug.cgi?id=140339
+
+        Reviewed by Mark Rowe.
+
+        * Makefile.shared: Run xcodebuild with the same PATH with which the Xcode IDE runs. This
+        prevents unnecessary rebuilding due to PATH differences.
+
 2015-01-07  Gwang Yoon Hwang  <yoon@igalia.com>
 
         [GTK][ThreadedCompositor] Add support for threaded compositor.

diff --git a/Makefile.shared b/Makefile.shared
index 600635048090d8678179a3ac5290ad952f018ce8..61c066dfe96fa33d4469643368cfb44a958bbb1c 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -35,6 +35,10 @@ endif
 
 export DSYMUTIL_NUM_THREADS = $(shell sysctl -n hw.activecpu)
 
+# Run xcodebuild with the same PATH with which the Xcode IDE runs, to mitigate unnecessary rebuilds due to PATH differences.
+# See <rdar://problem/16466196>.
+export PATH = $(shell getconf PATH)
+
 all: set_asan_configuration
        ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )