From 7a1d08b7be1ce614a5071d5a7b4d4c3fab9d98f2 Mon Sep 17 00:00:00 2001 From: Steven Johnson Date: Thu, 6 Aug 2020 14:48:02 -0700 Subject: [PATCH] Revert "Use / instead of \ in LLVM_DIR on all platforms" --- master/master.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/master/master.cfg b/master/master.cfg index a0b74cc9..b6abfe28 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -319,12 +319,10 @@ def get_cmake_options(os): def get_halide_cmake_definitions(os, config, halide_target='host'): cmake_definitions = { - # todo: remove Clang_DIR line when halide/Halide#5135 lands - # Use "CMake paths" which always use forward slashes, even on Windows. - 'LLVM_DIR': get_llvm_install_path(config, 'lib/cmake/llvm').replace('\\', '/'), - 'Clang_DIR': get_llvm_install_path(config, 'lib/cmake/clang').replace('\\', '/'), + 'Clang_DIR': get_llvm_install_path(config, 'lib/cmake/clang'), 'CMAKE_BUILD_TYPE': config, 'Halide_TARGET': halide_target, + 'LLVM_DIR': get_llvm_install_path(config, 'lib/cmake/llvm'), } # The linux and arm linux buildbots have ccache installed