pw_toolchain: Hide toolchain path behind variable

Followup to http://pwrev.dev/223578. Bug: 258836641 Change-Id: Ia0aa90ad6351571dd4a29eb10aac9a800c7ea14a Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/224851 Commit-Queue: Auto-Submit <[email protected]> Commit-Queue: Ted Pudlik <[email protected]> Pigweed-Auto-Submit: Ted Pudlik <[email protected]> Lint: Lint 🤖 <[email protected]> Reviewed-by: Taylor Cramer <[email protected]>
google · Jul 22, 2024 · 2005f5e · 2005f5e
1 parent a70c899
commit 2005f5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pw_toolchain/host_clang/BUILD.bazel b/pw_toolchain/host_clang/BUILD.bazel
@@ -23,7 +23,7 @@ load(
     "pw_cc_toolchain",
 )
 load("@pw_xcode_command_line_tools//:defs.bzl", "XCODE_SDK_PATH")
-load("//pw_toolchain/host_clang:linux_sysroot.bzl", "LINUX_SYSROOT")
+load("//pw_toolchain/host_clang:paths.bzl", "LINUX_SYSROOT", "LLVM_TOOLCHAIN")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -38,7 +38,7 @@ pw_cc_flag_set(
         # Force dropping the system libc++.
         "-nostdlib++",
         # Use libc++ provided by the toolchain.
-        "external/llvm_toolchain/lib/libc++.a",
+        LLVM_TOOLCHAIN + "/lib/libc++.a",
     ],
     target_compatible_with = ["@platforms//os:macos"],
 )

diff --git a/pw_toolchain/host_clang/linux_sysroot.bzl → pw_toolchain/host_clang/paths.bzl b/pw_toolchain/host_clang/linux_sysroot.bzl → pw_toolchain/host_clang/paths.bzl
@@ -16,3 +16,4 @@
 
 # TODO: https://pwbug.dev/346388161 - Remove this once we migrate to rules_cc.
 LINUX_SYSROOT = "external/" + Label("@linux_sysroot").repo_name
+LLVM_TOOLCHAIN = "external/" + Label("@llvm_toolchain").repo_name
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@

		# TODO: https://pwbug.dev/346388161 - Remove this once we migrate to rules_cc.
		LINUX_SYSROOT = "external/" + Label("@linux_sysroot").repo_name
		LLVM_TOOLCHAIN = "external/" + Label("@llvm_toolchain").repo_name