From 2ecfb3e9864d858b283487acc8544bfd40f2241c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 3 Nov 2017 14:43:33 +0100 Subject: [PATCH] CONFIG: update clang versions --- etc/bashrc | 2 +- etc/config.csh/compiler | 5 ++++- etc/config.sh/compiler | 5 ++++- etc/cshrc | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 597d5494d6..dbe16c9d7a 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -65,7 +65,7 @@ export WM_COMPILER_TYPE=system #- Compiler: # WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL -# | Clang | Clang3[8-9] | Clang40 | Icc | IccKNL | Cray +# | Clang | Clang3[8-9] | Gcc[45]0 | Icc | IccKNL | Cray export WM_COMPILER=Gcc unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler index 7494af8f45..fa9915788b 100644 --- a/etc/config.csh/compiler +++ b/etc/config.csh/compiler @@ -82,7 +82,10 @@ case ThirdParty: set clang_version=llvm-3.9.1 breaksw case Clang40: - set clang_version=llvm-4.0.0 + set clang_version=llvm-4.0.1 + breaksw + case Clang50: + set clang_version=llvm-5.0.0 breaksw default: /bin/cat << UNKNOWN_COMPILER diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler index cb45f30394..3a1aefd63f 100644 --- a/etc/config.sh/compiler +++ b/etc/config.sh/compiler @@ -81,7 +81,10 @@ ThirdParty) clang_version=llvm-3.9.1 ;; Clang40) - clang_version=llvm-4.0.0 + clang_version=llvm-4.0.1 + ;; + Clang50) + clang_version=llvm-5.0.0 ;; *) /bin/cat << UNKNOWN_COMPILER 1>&2 diff --git a/etc/cshrc b/etc/cshrc index 7cefb2f383..4b186c3fce 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -61,7 +61,7 @@ setenv WM_COMPILER_TYPE system #- Compiler: # WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL -# | Clang | Clang3[8-9] | Clang40 | Icc | IccKNL | Cray +# | Clang | Clang3[8-9] | Gcc[45]0 | Icc | IccKNL | Cray setenv WM_COMPILER Gcc setenv WM_COMPILER_ARCH # defined but empty unsetenv WM_COMPILER_LIB_ARCH