[irods/irods#7220] Do not explicitly build against libc++

irods · Mar 5, 2024 · 944049c · 944049c
1 parent 7833d15
commit 944049c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,8 +36,6 @@ endif()
 
 set(IRODS_BUILD_WITH_WERROR ${IRODS_BUILD_WITH_WERROR_DEFAULT} CACHE BOOL "Choose whether to compile with -Werror.")
 
-include(UseLibCXX)
-
 if (IRODS_BUILD_WITH_WERROR)
   add_compile_options(-Werror)
 endif()

diff --git a/irods_consortium_continuous_integration_build_hook.py b/irods_consortium_continuous_integration_build_hook.py
@@ -16,15 +16,14 @@ def add_cmake_to_front_of_path():
 
 def install_building_dependencies(externals_directory):
     externals_list = [
-        'irods-externals-avro1.11.0-2',
-        'irods-externals-boost1.81.0-0',
-        'irods-externals-clang-runtime13.0.0-0',
-        'irods-externals-clang13.0.0-0',
+        'irods-externals-avro1.11.0-3',
+        'irods-externals-boost1.81.0-1',
+        'irods-externals-clang13.0.1-0',
         'irods-externals-cmake3.21.4-0',
         'irods-externals-cppzmq4.8.1-1',
         'irods-externals-json3.10.4-0',
         'irods-externals-libarchive3.5.2-0',
-        'irods-externals-zeromq4-14.1.8-0'
+        'irods-externals-zeromq4-14.1.8-1'
     ]
     if externals_directory == 'None' or externals_directory is None:
         irods_python_ci_utilities.install_irods_core_dev_repository()