[tbb-commits] [tor-browser-build/master] Use a more recent version of gcc

[gk at torproject.org]

commit 77b52782bc81b00a7cd702fa50459cd56a0752e8
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon May 28 10:06:40 2018 -0400

    Use a more recent version of gcc
---
 projects/llvm/build  | 7 +++++++
 projects/llvm/config | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/projects/llvm/build b/projects/llvm/build
index b018ca5..0958a4c 100644
--- a/projects/llvm/build
+++ b/projects/llvm/build
@@ -4,6 +4,13 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p /var/tmp/dist
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
 export PATH="/var/tmp/dist/cmake/bin:$PATH"
+[% IF c("var/linux") %]
+  # We need a link to our GCC, otherwise the system cc gets used which points to
+  # /usr/bin/gcc.
+  [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),
+                              hardened_gcc => 0 }) %]
+  ln -s gcc /var/tmp/dist/gcc/bin/cc
+[% END -%]
 mkdir -p /var/tmp/build
 cd /var/tmp/build
 tar -xf $rootdir/[% c('input_files_by_name/llvm') %]
diff --git a/projects/llvm/config b/projects/llvm/config
index 44252b4..76fb2c0 100644
--- a/projects/llvm/config
+++ b/projects/llvm/config
@@ -8,6 +8,9 @@ var:
 
 input_files:
   - project: container-image
+  - name: '[% c("var/compiler") %]'
+    project: '[% c("var/compiler") %]'
+    enable: '[% c("var/linux") %]'
   - project: cmake
     name: cmake
   - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz'