Attempt to 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:19:41 +0000 (17:19 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Sep 2015 17:19:41 +0000 (17:19 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=149539)

{32, 64}-bit Mac builders should not try to build project {Plugin.64, Plugin.32},
respectively; only pass ONLY_ACTIVE_ARCH=NO when building for iOS.

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

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

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

index fb77287..7b8368e 100644 (file)
@@ -211,6 +211,8 @@ class CompileWebKit(shell.Compile):
         architecture = self.getProperty('architecture')
         if platform in ('mac', 'ios') and architecture:
             self.setCommand(self.command + ['ARCHS=' + architecture, 'ONLY_ACTIVE_ARCH=NO'])
+            if platform == 'ios':
+                self.setCommand(self.command + ['ONLY_ACTIVE_ARCH=NO'])
         if platform == 'mac' and buildOnly:
             self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym'])
 
index 420ebcf..9adbc44 100644 (file)
@@ -1,3 +1,14 @@
+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)
+
+        {32, 64}-bit Mac builders should not try to build project {Plugin.64, Plugin.32},
+        respectively; only pass ONLY_ACTIVE_ARCH=NO when building for iOS.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (CompileWebKit.start):
+
 2015-09-30  Lucas Forschler  <lforschler@apple.com>
 
         bot210 was configured for a queue instead of bot126.