diff --git a/scripts/windows/conda-toolchain.cmake b/scripts/windows/conda-toolchain.cmake index f3ae972030..08a5344dd0 100644 --- a/scripts/windows/conda-toolchain.cmake +++ b/scripts/windows/conda-toolchain.cmake @@ -16,10 +16,10 @@ endif() # Set the C++ compiler and tools. if(NOT CMAKE_C_COMPILER) - find_program(CMAKE_C_COMPILER NAMES clang-cl REQUIRED DOC "Clang C Compiler (MSVC Compatible)") + find_program(CMAKE_C_COMPILER NAMES clang REQUIRED DOC "Clang C Compiler (MSVC Compatible)") endif() if(NOT CMAKE_CXX_COMPILER) - find_program(CMAKE_CXX_COMPILER NAMES clang-cl REQUIRED DOC "Clang C++ Compiler (MSVC Compatible)") + find_program(CMAKE_CXX_COMPILER NAMES clang REQUIRED DOC "Clang C++ Compiler (MSVC Compatible)") endif() if(NOT CMAKE_RC_COMPILER) find_program(CMAKE_RC_COMPILER NAMES llvm-rc REQUIRED DOC "LLVM Resource Compiler") @@ -34,9 +34,9 @@ endif() if(EXISTS $ENV{CONDA_PREFIX}/xwin) cmake_path(CONVERT "$ENV{CONDA_PREFIX}\\xwin" TO_CMAKE_PATH_LIST XWIN_PREFIX) - set(CMAKE_C_FLAGS_INIT "/winsysroot ${XWIN_PREFIX} -fuse-ld=lld-link") - set(CMAKE_CXX_FLAGS_INIT "/winsysroot ${XWIN_PREFIX} -fuse-ld=lld-link") - set(CMAKE_RC_FLAGS_INIT "/winsysroot ${XWIN_PREFIX} -fuse-ld=lld-link") + set(CMAKE_C_FLAGS_INIT "--sysroot ${XWIN_PREFIX} -fuse-ld=lld-link") + set(CMAKE_CXX_FLAGS_INIT "--sysroot ${XWIN_PREFIX} -fuse-ld=lld-link") + set(CMAKE_RC_FLAGS_INIT "--sysroot ${XWIN_PREFIX} -fuse-ld=lld-link") set(CMAKE_LINKER ${CMAKE_CURRENT_LIST_DIR}/xwin-link.bat CACHE FILEPATH "LLD Linker for the Xwin SDK") elseif(NOT CMAKE_LINKER) find_program(CMAKE_LINKER NAMES lld-link REQUIRED DOC "LLD Linker (MSVC Compatible)")