[tor-commits] [tor-browser-build/master] Bug 24632: Disable snowflake for macOS for now

[boklm at torproject.org]

commit 3db16b9c473ec950452126700fc1e22f71ed8190
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jun 4 06:15:20 2018 +0000

    Bug 24632: Disable snowflake for macOS for now
    
    The snowflake build system is pretty complicated. We disable this pluggable
    transport for now to get time to adapt it to the new macOS toolchain while
    not blocking our nightly builds. See bug 26251 for work on that.
---
 rbm.conf | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/rbm.conf b/rbm.conf
index 9a30353..28ce6f9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -162,8 +162,7 @@ targets:
     var:
       linux: 1
       compiler: gcc
-      # We only build snowflake for linux and osx on the alpha and nightly
-      # channels for now.
+      # We only build snowflake for linux on the alpha and nightly channels for now.
       snowflake: '[% c("var/alpha") || c("var/nightly") %]'
       fteproxy: 1
       container:
@@ -244,9 +243,8 @@ targets:
       FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"
       LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
       locale_ja: ja-JP-mac
-      # We only build snowflake for linux and osx on the alpha and nightly
-      # channels for now.
-      snowflake: '[% c("var/alpha") || c("var/nightly") %]'
+      # We only build snowflake for linux on the alpha and nightly channels for now.
+      snowflake: 0 #'[% c("var/alpha") || c("var/nightly") %]'
       deps:
         - build-essential
         - python