Actually fix the Mac builders build after <http://trac.webkit.org/changeset/190219>
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Sep 2015 17:23:28 +0000 (17:23 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Sep 2015 17:23:28 +0000 (17:23 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=149539)

I inadvertently didn't remove the ONLY_ACTIVE_ARCH=NO flag when building on a Mac
in <http://trac.webkit.org/changeset/190351>.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(CompileWebKit.start):

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

Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/ChangeLog

index 7b8368e..4bf8c8b 100644 (file)
@@ -210,7 +210,7 @@ class CompileWebKit(shell.Compile):
         buildOnly = self.getProperty('buildOnly')
         architecture = self.getProperty('architecture')
         if platform in ('mac', 'ios') and architecture:
         buildOnly = self.getProperty('buildOnly')
         architecture = self.getProperty('architecture')
         if platform in ('mac', 'ios') and architecture:
-            self.setCommand(self.command + ['ARCHS=' + architecture, 'ONLY_ACTIVE_ARCH=NO'])
+            self.setCommand(self.command + ['ARCHS=' + architecture])
             if platform == 'ios':
                 self.setCommand(self.command + ['ONLY_ACTIVE_ARCH=NO'])
         if platform == 'mac' and buildOnly:
             if platform == 'ios':
                 self.setCommand(self.command + ['ONLY_ACTIVE_ARCH=NO'])
         if platform == 'mac' and buildOnly:
index 9adbc44..649d0fb 100644 (file)
@@ -1,5 +1,16 @@
 2015-09-30  Daniel Bates  <dabates@apple.com>
 
 2015-09-30  Daniel Bates  <dabates@apple.com>
 
+        Actually fix the Mac builders build after <http://trac.webkit.org/changeset/190219>
+        (https://bugs.webkit.org/show_bug.cgi?id=149539)
+
+        I inadvertently didn't remove the ONLY_ACTIVE_ARCH=NO flag when building on a Mac
+        in <http://trac.webkit.org/changeset/190351>.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (CompileWebKit.start):
+
+2015-09-30  Daniel Bates  <dabates@apple.com>
+
         Attempt to fix the Mac builders build after <http://trac.webkit.org/changeset/190219>
         (https://bugs.webkit.org/show_bug.cgi?id=149539)
 
         Attempt to fix the Mac builders build after <http://trac.webkit.org/changeset/190219>
         (https://bugs.webkit.org/show_bug.cgi?id=149539)