Skip to content

Commit 2bd7c30

Browse files
committed
[Bazel] Reduce quote escaping
There's a lot of unnecessary backslashes here that we can avoid to reduce confusion. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D108495
1 parent 973cb2c commit 2bd7c30

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

+8-7
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,13 @@ exports_files(
343343
genrule(
344344
name = "basic_version_gen",
345345
outs = ["include/clang/Basic/Version.inc"],
346-
cmd = ("printf " +
347-
"\"#define CLANG_VERSION 12.0\n\"" +
348-
"\"#define CLANG_VERSION_MAJOR 12\n\"" +
349-
"\"#define CLANG_VERSION_MINOR 0\n\"" +
350-
"\"#define CLANG_VERSION_PATCHLEVEL 0\n\"" +
351-
"\"#define CLANG_VERSION_STRING \\\"git\\\"\n\" > $@"),
346+
cmd = (
347+
"echo '#define CLANG_VERSION 12.0' >> $@\n" +
348+
"echo '#define CLANG_VERSION_MAJOR 12' >> $@\n" +
349+
"echo '#define CLANG_VERSION_MINOR 0' >> $@\n" +
350+
"echo '#define CLANG_VERSION_PATCHLEVEL 0' >> $@\n" +
351+
"echo '#define CLANG_VERSION_STRING \"git\"' >> $@\n"
352+
),
352353
)
353354

354355
cc_library(
@@ -372,7 +373,7 @@ genrule(
372373
# are passed through bazel, it's easier to drop generated files next to
373374
# the other includes.
374375
outs = ["include/VCSVersion.inc"],
375-
cmd = "echo \"#define CLANG_REVISION \\\"git\\\"\" > $@",
376+
cmd = "echo '#define CLANG_REVISION \"git\"' > $@",
376377
)
377378

378379
# A hacky library to expose some internal headers of the `basic` library to its

utils/bazel/llvm-project-overlay/llvm/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ enum_targets_gen(
9898
genrule(
9999
name = "version_info_gen",
100100
outs = ["include/llvm/Config/VersionInfo.h"],
101-
cmd = "echo \"#define LLVM_VERSION_INFO \\\"git\\\"\" > $@",
101+
cmd = "echo '#define LLVM_VERSION_INFO \"git\"' > $@",
102102
)
103103

104104
template_rule(

utils/bazel/llvm-project-overlay/llvm/config.bzl

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66

77
def native_arch_defines(arch, triple):
88
return [
9-
"LLVM_NATIVE_ARCH=\\\"{}\\\"".format(arch),
9+
r'LLVM_NATIVE_ARCH=\"{}\"'.format(arch),
1010
"LLVM_NATIVE_ASMPARSER=LLVMInitialize{}AsmParser".format(arch),
1111
"LLVM_NATIVE_ASMPRINTER=LLVMInitialize{}AsmPrinter".format(arch),
1212
"LLVM_NATIVE_DISASSEMBLER=LLVMInitialize{}Disassembler".format(arch),
1313
"LLVM_NATIVE_TARGET=LLVMInitialize{}Target".format(arch),
1414
"LLVM_NATIVE_TARGETINFO=LLVMInitialize{}TargetInfo".format(arch),
1515
"LLVM_NATIVE_TARGETMC=LLVMInitialize{}TargetMC".format(arch),
1616
"LLVM_NATIVE_TARGETMCA=LLVMInitialize{}TargetMCA".format(arch),
17-
"LLVM_HOST_TRIPLE=\\\"{}\\\"".format(triple),
18-
"LLVM_DEFAULT_TARGET_TRIPLE=\\\"{}\\\"".format(triple),
17+
r'LLVM_HOST_TRIPLE=\"{}\"'.format(triple),
18+
r'LLVM_DEFAULT_TARGET_TRIPLE=\"{}\"'.format(triple),
1919
]
2020

2121
posix_defines = [
2222
"LLVM_ON_UNIX=1",
2323
"HAVE_BACKTRACE=1",
2424
"BACKTRACE_HEADER=<execinfo.h>",
25-
"LTDL_SHLIB_EXT=\\\".so\\\"",
26-
"LLVM_PLUGIN_EXT=\\\".so\\\"",
25+
r'LTDL_SHLIB_EXT=\".so\"',
26+
r'LLVM_PLUGIN_EXT=\".so\"',
2727
"LLVM_ENABLE_THREADS=1",
2828
"HAVE_SYSEXITS_H=1",
2929
"HAVE_UNISTD_H=1",
@@ -60,8 +60,8 @@ win32_defines = [
6060
"strdup=_strdup",
6161

6262
# LLVM features
63-
"LTDL_SHLIB_EXT=\\\".dll\\\"",
64-
"LLVM_PLUGIN_EXT=\\\".dll\\\"",
63+
r'LTDL_SHLIB_EXT=\".dll\"',
64+
r'LLVM_PLUGIN_EXT=\".dll\"',
6565
]
6666

6767
# TODO: We should switch to platforms-based config settings to make this easier

0 commit comments

Comments
 (0)