Switch to libstdc++ as default (#6775)

Author: achamayou

.github/workflows/long-test.yml

@@ -53,7 +53,7 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           mkdir build
           cd build
-          cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON -DUSE_LIBCXX=OFF ..
+          cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON ..
           ninja
 
       - name: "Test"
@@ -177,7 +177,8 @@ jobs:
           git config --global --add safe.directory /__w/CCF/CCF
           mkdir build
           cd build
-          cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON ..
+          # Use libc++ to enable hardening/bounds checking during tests
+          cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON ..
           ninja
 
       - name: "Test"

CMakeLists.txt

@@ -113,7 +113,7 @@ endif()
 option(USE_SNMALLOC "Link virtual build against snmalloc" ON)
 
 # Default inherited from Open Enclave usage
-option(USE_LIBCXX "Use libc++ instead of libstdc++" ON)
+option(USE_LIBCXX "Use libc++ instead of libstdc++" OFF)
 
 enable_language(ASM)
 

cmake/cpack_settings.cmake

@@ -26,7 +26,9 @@ set(CCF_DEB_BASE_DEPENDENCIES
 )
 set(CCF_DEB_DEPENDENCIES ${CCF_DEB_BASE_DEPENDENCIES})
 
-list(APPEND CCF_DEB_DEPENDENCIES "libc++1-15;libc++abi1-15")
+if(USE_LIBCXX)
+  list(APPEND CCF_DEB_DEPENDENCIES "libc++1-15;libc++abi1-15")
+endif()
 
 list(JOIN CCF_DEB_DEPENDENCIES ", " CPACK_DEBIAN_PACKAGE_DEPENDS)