From dd57a6e6950b09522830f142279b8631846b0df7 Mon Sep 17 00:00:00 2001 From: peter klausler Date: Thu, 26 Apr 2018 16:16:01 -0700 Subject: [PATCH] [flang] Refine CMakeLists.txt tweaks. Original-commit: flang-compiler/f18@b40c68f9ab8fda8b8110159b6f6e9faf530aeedc Reviewed-on: https://github.com/flang-compiler/f18/pull/73 Tree-same-pre-rewrite: false --- flang/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index d5741fb9d43e..015cc57308e6 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.9.0) # # Reminder: The normal way to set the compiler is via the CXX environment variable # -# CXX=/opt/gcc-7.2.0/bin/g++ cmake .../f18 +# CXX=/opt/gcc-7.3.0/bin/g++ cmake .../f18 # # but for convenience we provide the following cmake variables to # use an existing gcc installation directory. @@ -12,12 +12,13 @@ cmake_minimum_required(VERSION 3.9.0) # Pass '-DPGI=1' to cmake to use the latest gcc installation at PGI. # Add '-DCLANG=1' to use clang. if( PGI ) + set(GCCVERS gcc-7.3.0/linux86-64/redhat) if(CLANG) # This copy on hsw3 has one-line patch to include/c++/7.3.0/variant - set(GCC /local/home/pklausler/gcc/gcc-7.3.0/linux86-64/redhat) + set(GCC /local/home/pklausler/gcc/${GCCVERS}) set(CLANG /home/sw/thirdparty/llvm/linux86-64/6.0-pgi2) else() - set(GCC /home/sw/thirdparty/gcc/gcc-7.3.0/linux86-64/redhat) + set(GCC /home/sw/thirdparty/gcc/${GCCVERS}) endif() endif() -- 2.34.1