From 3fd2c17cf2d91a955e1cfccc6aeae5b9c3f1f668 Mon Sep 17 00:00:00 2001 From: peter klausler Date: Thu, 26 Apr 2018 17:03:54 -0700 Subject: [PATCH] [flang] Use libc++ with clang. Original-commit: flang-compiler/f18@d81b8d87f8712bc478931637f124c5a6a22d928b Reviewed-on: https://github.com/flang-compiler/f18/pull/73 Tree-same-pre-rewrite: false --- flang/CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index 015cc57..4b48b87 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -10,15 +10,11 @@ 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. +# Add '-DCLANG=1' to use clang and libc++. if( PGI ) - set(GCCVERS gcc-7.3.0/linux86-64/redhat) + set(GCC /home/sw/thirdparty/gcc/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/${GCCVERS}) set(CLANG /home/sw/thirdparty/llvm/linux86-64/6.0-pgi2) - else() - set(GCC /home/sw/thirdparty/gcc/${GCCVERS}) endif() endif() @@ -27,7 +23,7 @@ if( GCC ) if (CLANG) set(CMAKE_CXX_COMPILER "${CLANG}/bin/clang++") set(CMAKE_CC_COMPILER "${CLANG}/bin/clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GCC}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") else() set(CMAKE_CXX_COMPILER "${GCC}/bin/g++") set(CMAKE_CC_COMPILER "${GCC}/bin/gcc") @@ -47,7 +43,7 @@ message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}") if(CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) if(CLANG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GCC}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") -- 2.7.4