[tor-commits] [tor-browser-build/master] Bug 31467: Switch to clang for cctools project

[boklm at torproject.org]

commit d14719716fe9b4940686fd5a6b449fd7680176df
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Aug 20 08:55:37 2019 +0000

    Bug 31467: Switch to clang for cctools project
---
 projects/cctools/build  |  4 ++--
 projects/cctools/config |  4 ++--
 projects/llvm/build     | 37 -------------------------------------
 projects/llvm/config    | 35 -----------------------------------
 4 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/projects/cctools/build b/projects/cctools/build
index cad9e3a..a724399 100644
--- a/projects/cctools/build
+++ b/projects/cctools/build
@@ -2,8 +2,8 @@
 [% c("var/set_default_env") -%]
 distdir=/var/tmp/dist/[% project %]
 mkdir -p /var/tmp/dist
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %]
-export PATH="/var/tmp/dist/llvm/bin:$PATH"
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
+export PATH="/var/tmp/dist/clang/bin:$PATH"
 mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]/cctools
diff --git a/projects/cctools/config b/projects/cctools/config
index cb84ec4..8e7ff65 100644
--- a/projects/cctools/config
+++ b/projects/cctools/config
@@ -12,5 +12,5 @@ var:
 
 input_files:
   - project: container-image
-  - name: llvm
-    project: llvm
+  - name: clang
+    project: clang
diff --git a/projects/llvm/build b/projects/llvm/build
deleted file mode 100644
index 0958a4c..0000000
--- a/projects/llvm/build
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-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') %]
-tar -xf $rootdir/[% c('input_files_by_name/cfe') %]
-tar -xf $rootdir/[% c('input_files_by_name/libcxx') %]
-tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %]
-mv cfe-* clang
-mv libcxx-* libcxx
-mv libcxxabi-* libcxxabi
-mv clang llvm-*/tools
-mv libcxx llvm-*/projects
-mv libcxxabi llvm-*/projects
-cd llvm-*
-export LLVM_HOME=$(pwd)
-mkdir build
-cd build
-cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME
-make -j[% c("buildconf/num_procs") %]
-make install
-cd /var/tmp/dist
-[% c('tar', {
-        tar_src => [ project ],
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
-    }) %]
diff --git a/projects/llvm/config b/projects/llvm/config
deleted file mode 100644
index 76fb2c0..0000000
--- a/projects/llvm/config
+++ /dev/null
@@ -1,35 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 3.9.1
-filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-
-var:
-  container:
-    use_container: 1
-
-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'
-    name: llvm
-    sig_ext: sig
-    file_gpg_id: 1
-    gpg_keyring: llvm.gpg
-  - URL: 'https://releases.llvm.org/[% c("version") %]/cfe-[% c("version") %].src.tar.xz'
-    name: cfe
-    sig_ext: sig
-    file_gpg_id: 1
-    gpg_keyring: llvm.gpg
-  - URL: 'https://releases.llvm.org/[% c("version") %]/libcxx-[% c("version") %].src.tar.xz'
-    name: libcxx
-    sig_ext: sig
-    file_gpg_id: 1
-    gpg_keyring: llvm.gpg
-  - URL: 'https://releases.llvm.org/[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz'
-    name: libcxxabi
-    sig_ext: sig
-    file_gpg_id: 1
-    gpg_keyring: llvm.gpg