[Xcode] Use the same environment for command-line and IDE builds

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

Reviewed by Anders Carlsson.

* Scripts/webkitdirs.pm:
(XcodeOptions): Set the UseSanitizedBuildSystemEnvironment user default to YES, which makes
xcodebuild use the same environment Xcode uses.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3d20e0e..ac175d2 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,16 @@
 2015-06-28  Dan Bernstein  <mitz@apple.com>
 
 2015-06-28  Dan Bernstein  <mitz@apple.com>
 

+        [Xcode] Use the same environment for command-line and IDE builds
+        https://bugs.webkit.org/show_bug.cgi?id=146401
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/webkitdirs.pm:
+        (XcodeOptions): Set the UseSanitizedBuildSystemEnvironment user default to YES, which makes
+        xcodebuild use the same environment Xcode uses.
+
+2015-06-28  Dan Bernstein  <mitz@apple.com>
+

         REGRESSION (r185915): Source-incompatible change in WKPageUIClient
         https://bugs.webkit.org/show_bug.cgi?id=146396
 
         REGRESSION (r185915): Source-incompatible change in WKPageUIClient
         https://bugs.webkit.org/show_bug.cgi?id=146396
 

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index e1269e4..c46de90 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -674,7 +674,7 @@ sub XcodeOptions
     my @architectureOption = ($architecture ? "ARCHS=$architecture" : ());
     my @asanOption = ($asanIsEnabled ? ("-xcconfig", sourceDir() . "/Tools/asan/asan.xcconfig", "ASAN_IGNORE=" . sourceDir() . "/Tools/asan/webkit-asan-ignore.txt") : ());
 
     my @architectureOption = ($architecture ? "ARCHS=$architecture" : ());
     my @asanOption = ($asanIsEnabled ? ("-xcconfig", sourceDir() . "/Tools/asan/asan.xcconfig", "ASAN_IGNORE=" . sourceDir() . "/Tools/asan/webkit-asan-ignore.txt") : ());
 

-    return (@baseProductDirOption, "-configuration", $configuration, @architectureOption, @sdkOption, @asanOption, argumentsForXcode());
+    return ("-UseSanitizedBuildSystemEnvironment=YES", @baseProductDirOption, "-configuration", $configuration, @architectureOption, @sdkOption, @asanOption, argumentsForXcode());

 }
 
 sub XcodeOptionString
 }
 
 sub XcodeOptionString