Skip to content

Commit de862c7

Browse files
authored
Fixes CMake configuration failures related with Windows-style/mixed path. (llvm#300)
Fixes syntax errors in cmake code when passing Windows-style path as a string variable during the cmake configuration, such as `CMAKE_C_COMPILER=c:\buildbot\as-builder-10\lldb-x-aarch64/build/bin/clang.exe`, when running `lldb-remote-linux-win` builder. Error: Invalid character escape '\b'. To fix, use ':PATH' var type suffix for the passing variables that contain the path values.
1 parent 699b96d commit de862c7

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3458,15 +3458,14 @@
34583458

34593459
"TOOLCHAIN_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
34603460
"TOOLCHAIN_TARGET_COMPILER_FLAGS" : "-mcpu=cortex-a78",
3461-
"TOOLCHAIN_TARGET_SYSROOTFS" : util.Interpolate("%(prop:sysroot_path_aarch64)s"),
3461+
"TOOLCHAIN_TARGET_SYSROOTFS:PATH" : util.Interpolate("%(prop:sysroot_path_aarch64)s"),
34623462
"LIBCXX_ABI_VERSION" : "1",
34633463
"LLVM_INSTALL_TOOLCHAIN_ONLY" : "OFF",
34643464

34653465
"LLDB_TEST_ARCH" : "aarch64",
3466-
"LLDB_TEST_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang.exe"),
34673466
"LLDB_TEST_PLATFORM_URL" : util.Interpolate("connect://%(prop:remote_test_host)s:1234"),
34683467
"LLDB_TEST_PLATFORM_WORKING_DIR": "/home/ubuntu/lldb-tests",
3469-
"LLDB_TEST_SYSROOT" : util.Interpolate("%(prop:sysroot_path_aarch64)s"),
3468+
"LLDB_TEST_SYSROOT:PATH" : util.Interpolate("%(prop:sysroot_path_aarch64)s"),
34703469
"LLDB_ENABLE_PYTHON" : "ON",
34713470
"LLDB_ENABLE_SWIG" : "ON",
34723471
"LLDB_ENABLE_LIBEDIT" : "OFF",
@@ -3503,15 +3502,15 @@
35033502
"CMAKE_C_FLAGS" : "-mcpu=cortex-a78 -D__OPTIMIZE__ -fPIC",
35043503
"CMAKE_EXE_LINKER_FLAGS" : "-Wl,-l:libc++abi.a -Wl,-l:libc++.a -Wl,-l:libunwind.a",
35053504
"CMAKE_SHARED_LINKER_FLAGS" : "-Wl,-l:libc++abi.a -Wl,-l:libc++.a -Wl,-l:libunwind.a",
3506-
"CMAKE_CXX_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang++.exe"),
3507-
"CMAKE_C_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang.exe"),
3508-
"CMAKE_ASM_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang.exe"),
3505+
"CMAKE_CXX_COMPILER:PATH" : util.Interpolate("%(prop:builddir)s/build/bin/clang++.exe"),
3506+
"CMAKE_C_COMPILER:PATH" : util.Interpolate("%(prop:builddir)s/build/bin/clang.exe"),
3507+
"CMAKE_ASM_COMPILER:PATH" : util.Interpolate("%(prop:builddir)s/build/bin/clang.exe"),
35093508
"CMAKE_SYSTEM_NAME" : "Linux",
35103509
"CMAKE_SYSTEM_PROCESSOR" : "aarch64",
35113510
"CMAKE_CROSSCOMPILING" : "ON",
35123511

35133512
# Required for the native table-gen
3514-
"LLVM_NATIVE_TOOL_DIR" : util.Interpolate("%(prop:builddir)s/build/bin"),
3513+
"LLVM_NATIVE_TOOL_DIR:PATH" : util.Interpolate("%(prop:builddir)s/build/bin"),
35153514

35163515
"LLVM_DEFAULT_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
35173516
"LLVM_HOST_TRIPLE" : "aarch64-unknown-linux-gnu",

0 commit comments

Comments
 (0)