Skip to content
Permalink
Browse files

Fix a C++ standard conflict between pocl & LLVM

for files compiled with LLVM flags, always let the LLVM flags
determine the C++ standard (-std=XYZ) instead of using pocl's
project-wide setting (CMAKE_CXX_STANDARD)
  • Loading branch information
Michal Babej
Michal Babej committed Feb 5, 2020
1 parent f3c9db2 commit 76ce2f9f2fa8c24ead8790572430a75e7408f054
Showing with 10 additions and 0 deletions.
  1. +5 −0 lib/CL/CMakeLists.txt
  2. +5 −0 lib/llvmopencl/CMakeLists.txt
@@ -23,6 +23,11 @@
#
#=============================================================================

# this is required, because we're compiling the C++ files of this directory
# with LLVM-provided flags, which usually contain their own setting of
# C++ standard, which may be in conflict with pocl's default C++ standard.
unset(CMAKE_CXX_STANDARD)

if(SANITIZER_OPTIONS)
add_compile_options(${SANITIZER_OPTIONS})
endif()
@@ -23,6 +23,11 @@
#
#=============================================================================

# this is required, because we're compiling these files with LLVM-provided flags, which
# usually contain their own setting of C++ standard, which may be in conflict
# with pocl's default C++ standard.
unset(CMAKE_CXX_STANDARD)

set(LLVMPASSES_SOURCES "AllocasToEntry.cc"
"AllocasToEntry.h"
"AutomaticLocals.cc"

0 comments on commit 76ce2f9

Please sign in to comment.
You can’t perform that action at this time.