.:

Revert accidental change in r179490.

* Makefile.shared:

Source/WebKit2:
Revert accidental (and super bad) change in r179490.

* WebProcess/com.apple.WebProcess.sb.in:

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

diff --git a/ChangeLog b/ChangeLog
index 939aa20dab3dd1147e392822949aebbf5f87a448..a96314e9dadc33c4c3b44ae809d1fe1f793747c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-02  Filip Pizlo  <fpizlo@apple.com>
+
+        Revert accidental change in r179490.
+
+        * Makefile.shared:
+
 2015-02-02  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, revert accidental change to Makefile.shared in r179478

diff --git a/Makefile.shared b/Makefile.shared
index 22faa94ffdef48cc893478a42f40a2fa8688dfe1..61c066dfe96fa33d4469643368cfb44a958bbb1c 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -12,8 +12,6 @@ ifneq (,$(ARCHS))
        XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
 endif
 
-XCODE_OPTIONS += TOOLCHAINS=com.apple.dt.toolchain.OSX10_11
-
 DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
 VERBOSITY ?= $(DEFAULT_VERBOSITY)
 

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 55668abc3d756fbb45518d7ad9f94572fde942c2..81d17f40ab294d0cb152835cd11fa7e81a29e60f 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-02  Filip Pizlo  <fpizlo@apple.com>
+
+        Revert accidental (and super bad) change in r179490.
+
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2015-02-02  Chris Dumez  <cdumez@apple.com>
 
         Access MemoryCache singleton using MemoryCache::singleton()

diff --git a/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in b/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
index fcc2d3f2e0ce485e39a68350fb9161379c9aaf8f..3eb5b1baa3947ce8458304c9fcd2eb8a2f0fc623 100644 (file)
--- a/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
+++ b/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
@@ -297,5 +297,3 @@
        (home-subpath "/Library/Components")
        (home-subpath "/Library/Keyboard Layouts")
        (home-subpath "/Library/Input Methods"))
-
-(allow default)