Skip to content

Commit 2c45413

Browse files
committed
Rename llvm_project_local -> llvm_project
1 parent 1ce173a commit 2c45413

File tree

7 files changed

+32
-31
lines changed

7 files changed

+32
-31
lines changed

BUILD

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPTS = select({
1818
# Disable warnings only for the LLVM includes.
1919
"/experimental:external",
2020
"/external:W0",
21-
"/external:I external/llvm_project_local/include",
21+
"/external:I external/llvm_project/include",
2222
],
2323
"//conditions:default": [
2424
"-std=c++17",
@@ -52,10 +52,10 @@ cc_library(
5252
],
5353
copts = COPTS,
5454
deps = [
55-
"@llvm_project_local//:clang-basic",
56-
"@llvm_project_local//:clang-lex",
57-
"@llvm_project_local//:lldb-api",
58-
"@llvm_project_local//:llvm-support",
55+
"@llvm_project//:clang-basic",
56+
"@llvm_project//:clang-lex",
57+
"@llvm_project//:lldb-api",
58+
"@llvm_project//:llvm-support",
5959
],
6060
)
6161

@@ -74,7 +74,7 @@ cc_test(
7474
":runner",
7575
"@com_google_googletest//:gtest",
7676
"@com_google_googletest//:gtest_main",
77-
"@llvm_project_local//:lldb-api",
77+
"@llvm_project//:lldb-api",
7878
],
7979
)
8080

@@ -86,7 +86,7 @@ cc_binary(
8686
":lldb-eval",
8787
":runner",
8888
"@bazel_tools//tools/cpp/runfiles",
89-
"@llvm_project_local//:lldb-api",
89+
"@llvm_project//:lldb-api",
9090
],
9191
)
9292

@@ -98,7 +98,7 @@ cc_test(
9898
":lldb-eval",
9999
"@com_google_googletest//:gtest",
100100
"@com_google_googletest//:gtest_main",
101-
"@llvm_project_local//:lldb-api",
101+
"@llvm_project//:lldb-api",
102102
],
103103
)
104104

@@ -110,10 +110,10 @@ cc_library(
110110
data = [
111111
"//testdata:test_binary_gen",
112112
"//testdata:test_binary_srcs",
113-
"@llvm_project_local//:lldb-server",
113+
"@llvm_project//:lldb-server",
114114
],
115115
deps = [
116116
"@bazel_tools//tools/cpp/runfiles",
117-
"@llvm_project_local//:lldb-api",
117+
"@llvm_project//:lldb-api",
118118
],
119119
)

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ You need to set the `LLVM_INSTALL_PATH` environmental variable with a location
7474
to your LLVM installation:
7575

7676
```bash
77-
# If you installed the packages via "apt install".
77+
# (Linux) If you installed the packages via "apt install".
7878
export LLVM_INSTALL_PATH=/usr/lib/llvm-10
79+
```
7980

80-
# If you built it from source using the instructions above.
81-
export LLVM_INSTALL_PATH=C:\src\llvm-project\build_x64_optdebug\install
81+
```powershell
82+
# (Windows) If you built it from source using the instructions above.
83+
$env:LLVM_INSTALL_PATH = C:\src\llvm-project\build_x64_optdebug\install
8284
```
8385

8486
Now you can build and test `lldb-eval`:
@@ -92,13 +94,13 @@ bazel run :main -- "(1 + 2) * 42 / 4"
9294
```
9395

9496
Depending on your distribution of LLVM, you may need to provide
95-
`--@llvm_project_local//:llvm_build={static,dynamic}` flag. For example, if your
97+
`--@llvm_project//:llvm_build={static,dynamic}` flag. For example, if your
9698
`liblldb.so` is linked dynamically (this is the case when installing via `apt`),
9799
then you need to use `llvm_build=dynamic`. The build script [tries to choose the
98100
correct default value automatically](/build_defs/repo_rules.bzl#L21), but it can
99101
be wrong in some situations (please, report and contribute 🙂).
100102

101-
> **Hint:** You can add this option to your `user.bazelrc`.
103+
> **Hint:** You can add this option to your `user.bazelrc`
102104
103105
## Disclamer
104106

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ http_archive(
2020

2121
load("//build_defs:repo_rules.bzl", "llvm_project_configure")
2222

23-
llvm_project_configure(name = "llvm_project_local")
23+
llvm_project_configure(name = "llvm_project")

src/runner.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ const uint32_t kWaitForEventTimeout = 5;
4545

4646
void SetupLLDBServerEnv(const Runfiles& runfiles) {
4747
#ifndef _WIN32
48-
std::string lldb_server =
49-
runfiles.Rlocation("llvm_project_local/bin/lldb-server");
48+
std::string lldb_server = runfiles.Rlocation("llvm_project/bin/lldb-server");
5049
setenv("LLDB_DEBUGSERVER_PATH", lldb_server.c_str(), 0);
5150
#endif // !_WIN32
5251
}

testdata/BUILD

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ genrule(
88
],
99
outs = ["test_binary"],
1010
cmd = """
11-
./$(location @llvm_project_local//:clang) \
11+
./$(location @llvm_project//:clang) \
1212
-x c++ -lstdc++ -std=c++14 -gdwarf -O0 -fuse-ld=lld \
1313
$(SRCS) -o $@
1414
""",
1515
tags = ["no-sandbox"],
1616
tools = [
17-
"@llvm_project_local//:clang",
18-
"@llvm_project_local//:lld",
17+
"@llvm_project//:clang",
18+
"@llvm_project//:lld",
1919
],
2020
)
2121

@@ -34,14 +34,14 @@ genrule(
3434
],
3535
outs = ["fuzzer_binary"],
3636
cmd = """
37-
./$(location @llvm_project_local//:clang) \
37+
./$(location @llvm_project//:clang) \
3838
-x c++ -lstdc++ -std=c++14 -gdwarf -O0 -fuse-ld=lld \
3939
$(SRCS) -o $@
4040
""",
4141
tags = ["no-sandbox"],
4242
tools = [
43-
"@llvm_project_local//:clang",
44-
"@llvm_project_local//:lld",
43+
"@llvm_project//:clang",
44+
"@llvm_project//:lld",
4545
],
4646
)
4747

tools/BUILD

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPTS = select({
55
# Disable warnings only for the LLVM includes.
66
"/experimental:external",
77
"/external:W0",
8-
"/external:I external/llvm_project_local/include",
8+
"/external:I external/llvm_project/include",
99
],
1010
"//conditions:default": [
1111
"-std=c++17",
@@ -19,9 +19,9 @@ cc_binary(
1919
srcs = ["lexer.cc"],
2020
copts = COPTS,
2121
deps = [
22-
"@llvm_project_local//:clang-basic",
23-
"@llvm_project_local//:clang-lex",
24-
"@llvm_project_local//:llvm-support",
22+
"@llvm_project//:clang-basic",
23+
"@llvm_project//:clang-lex",
24+
"@llvm_project//:llvm-support",
2525
],
2626
)
2727

@@ -46,12 +46,12 @@ cc_binary(
4646
data = [
4747
"//testdata:fuzzer_binary_gen",
4848
"//testdata:fuzzer_binary_srcs",
49-
"@llvm_project_local//:lldb-server",
49+
"@llvm_project//:lldb-server",
5050
],
5151
deps = [
5252
":fuzzer_lib",
5353
"//:lldb-eval",
5454
"@bazel_tools//tools/cpp/runfiles",
55-
"@llvm_project_local//:lldb-api",
55+
"@llvm_project//:lldb-api",
5656
],
5757
)

tools/fuzzer/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ using bazel::tools::cpp::runfiles::Runfiles;
4141

4242
constexpr char VAR[] = "x";
4343

44-
constexpr char LLDB_SERVER_KEY[] = "llvm_project_local/bin/lldb-server";
44+
constexpr char LLDB_SERVER_KEY[] = "llvm_project/bin/lldb-server";
4545
constexpr char EXECUTABLE_PATH_KEY[] = "lldb_eval/testdata/fuzzer_binary";
4646

4747
void run_repl(lldb::SBFrame& frame) {

0 commit comments

Comments
 (0)