From f3b1d9b4745371517a1fda55632b09a4a222a757 Mon Sep 17 00:00:00 2001 From: Matt Epperson Date: Fri, 26 Apr 2024 12:17:45 -0600 Subject: [PATCH] chore: Remove aspect_ names Topic: rm_aspect_names --- WORKSPACE | 2 +- docs/defs.md | 2 +- toolchain/defs.bzl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index da4647a..a10b92c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -workspace(name = "aspect_gcc_toolchain") +workspace(name = "gcc_toolchain") load("//toolchain:repositories.bzl", "gcc_toolchain_dependencies") diff --git a/docs/defs.md b/docs/defs.md index 89f9195..36c3d6e 100644 --- a/docs/defs.md +++ b/docs/defs.md @@ -26,7 +26,7 @@ gcc_toolchain(name, extra_cxxflags | Extra flags for compiling C++. | List of strings | optional | [] | | extra_fflags | Extra flags for compiling Fortran. | List of strings | optional | [] | | extra_ldflags | Extra flags for linking. %sysroot% is rendered to the sysroot path. %workspace% is rendered to the toolchain root path. See https://github.com/bazelbuild/bazel/blob/a48e246e/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java#L234-L254. | List of strings | optional | [] | -| gcc_toolchain_workspace_name | The name given to the gcc-toolchain repository, if the default was not used. | String | optional | "aspect_gcc_toolchain" | +| gcc_toolchain_workspace_name | The name given to the gcc-toolchain repository, if the default was not used. | String | optional | "gcc_toolchain" | | includes | Extra includes for compiling C and C++. %sysroot% is rendered to the sysroot path. %workspace% is rendered to the toolchain root path. See https://github.com/bazelbuild/bazel/blob/a48e246e/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java#L234-L254. | List of strings | optional | [] | | repo_mapping | A dictionary from local repository name to global repository name. This allows controls over workspace dependency resolution for dependencies of this repository.<p>For example, an entry "@foo": "@bar" declares that, for any time this repository depends on @foo (such as a dependency on @foo//some:target, it should actually resolve that dependency within globally-declared @bar (@bar//some:target). | Dictionary: String -> String | required | | | sysroot | A sysroot to be used as the logical build root. | String | required | | diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index 9a15de2..46d1fb0 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -110,7 +110,7 @@ _FEATURE_ATTRS = { ), "gcc_toolchain_workspace_name": attr.string( doc = "The name given to the gcc-toolchain repository, if the default was not used.", - default = "aspect_gcc_toolchain", + default = "gcc_toolchain", ), "includes": attr.string_list( doc = "Extra includes for compiling C and C++." +