[tor-commits] [tor-browser-bundle/master] Bug 22238: Fix use of hardened wrapper for the Linux build

[gk at torproject.org]

commit 48b68f84b34aef3567aeffe6932ff1e40d900f2b
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri May 12 18:14:24 2017 +0200

    Bug 22238: Fix use of hardened wrapper for the Linux build
    
    ESR52 includes this commit:
    https://hg.mozilla.org/mozilla-central/rev/f8cf0fe7c810
    which changes the compiler used from 'c++' to 'g++'.
---
 gitian/descriptors/linux/gitian-firefox.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index db4f232..a3bc37f 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -79,8 +79,10 @@ script: |
   cp /usr/bin/hardened-cc ./
   mv gcc gcc.real
   mv c++ c++.real
+  mv g++ g++.real
   ln -sf hardened-cc gcc
   ln -sf hardened-cc c++
+  ln -sf hardened-cc g++
   cd ~/build
   export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH
   ARCH=""