[tbb-commits] [tor-browser-bundle/maint-5.0] Bug 16960: OS X nightly tor target is broken

[gk at torproject.org]

commit 21c5686de61be2779dd0c5c4e87cfa70273a8646
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Sep 3 19:01:57 2015 +0000

    Bug 16960: OS X nightly tor target is broken
    
    Commit b79e90f6ba9426158cf305655590f70d3ae89875 (which fixed bug 16901)
    makes it necessary to update our CFLAGS for cross-compiling tor for
    OS X.
---
 gitian/descriptors/mac/gitian-tor.yml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 92f7c57..a6824c0 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -45,7 +45,7 @@ script: |
 
   # Building tor
   # XXX Clean up these flags?
-  export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5"
+  export CFLAGS="-m64 -I${INSTDIR}/openssl/include -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5"
   export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5"
   cd tor
   git update-index --refresh -q