use libc++

nebulastream · Feb 17, 2023 · bd9b52b · bd9b52b
1 parent 7483b11
commit bd9b52b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/custom-triplets/arm64-linux-nes.cmake b/custom-triplets/arm64-linux-nes.cmake
@@ -4,6 +4,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -stdlib=libc++")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}")
 if(NOT CMAKE_HOST_SYSTEM_PROCESSOR)
     execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()

diff --git a/custom-triplets/arm64-osx-nes.cmake b/custom-triplets/arm64-osx-nes.cmake
@@ -5,7 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES arm64)
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -stdlib=libc++")
-
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}")
 if (PORT STREQUAL paho-mqtt)
 	set(VCPKG_LIBRARY_LINKAGE static)
 endif()

diff --git a/custom-triplets/x64-linux-nes.cmake b/custom-triplets/x64-linux-nes.cmake
@@ -4,6 +4,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -stdlib=libc++")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}")
 if(NOT CMAKE_HOST_SYSTEM_PROCESSOR)
     execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()

diff --git a/custom-triplets/x64-osx-nes.cmake b/custom-triplets/x64-osx-nes.cmake
@@ -5,6 +5,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES x86_64)
 set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -stdlib=libc++")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS}")
 
 if (PORT STREQUAL paho-mqtt)
 	set(VCPKG_LIBRARY_LINKAGE static)

diff --git a/docker/entrypoint-build.sh b/docker/entrypoint-build.sh
@@ -23,7 +23,7 @@ then
 else
  echo "USE X64"
 fi
-export CC=clang++ CXX=clang++
+export CC=clang CXX=clang++
 if [ $# -eq 0 ]
 then
     cd /build_dir/