[tor-commits] [tor-browser-bundle/master] Bug 13329: Enabling stack canaries for ESR 31.

[gk at torproject.org]

commit e5512159cafecfd2e8b46644ed67506bcac0f97d
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Oct 6 09:37:30 2014 +0000

    Bug 13329: Enabling stack canaries for ESR 31.
---
 gitian/descriptors/linux/gitian-firefox.yml |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index 5d47b96..8f58353 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -72,6 +72,12 @@ script: |
   ln -sf ld.gold ld
   cd ~/build
   unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip
+  # Make sure we use the hardening wrapper when compiling Tor Browser.
+  cd $INSTDIR/gcc/bin
+  cp /usr/bin/hardened-cc ./
+  mv gcc gcc.real
+  ln -sf hardened-cc gcc
+  cd ~/build
   export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH
   ARCH=""
   if [ $GBUILD_BITS == "64" ];