Skip to content

Commit aa6e238

Browse files
SwooshyCuebalanking
authored andcommitted
[irods/irods#7220] Do not explicitly build against libc++
1 parent db59300 commit aa6e238

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ include(${IRODS_TARGETS_PATH})
2828
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
2929

3030
include(GNUInstallDirs)
31-
include(UseLibCXX)
3231

3332
if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
3433
set(IRODS_BUILD_WITH_WERROR_DEFAULT ON)

irods_consortium_continuous_integration_build_hook.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ def install_building_dependencies(externals_directory):
3838

3939
use_system_cmake = is_system_cmake_newer_than_externals_cmake()
4040

41-
externals_list = ['irods-externals-boost1.81.0-0',
42-
'irods-externals-clang-runtime13.0.0-0',
43-
'irods-externals-clang13.0.0-0',
41+
externals_list = ['irods-externals-boost1.81.0-1',
42+
'irods-externals-clang13.0.1-0',
4443
'irods-externals-json3.10.4-0']
4544
if not use_system_cmake:
4645
externals_list.append('irods-externals-cmake3.21.4-0')

0 commit comments

Comments
 (0)