Skip to content

use /usr/bin/basename for rules_cc #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 15, 2025
Merged

use /usr/bin/basename for rules_cc #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
823f6dd
use /usr/bin/basename for rules_cc
notoriaga Sep 11, 2025
03fec38
add missing ld.lld template
notoriaga Sep 11, 2025
5db66a0
also ld?
notoriaga Sep 11, 2025
72f0a9d
update linker files
notoriaga Sep 11, 2025
d28700e
try use_lld
notoriaga Sep 11, 2025
c4ede37
ld?
notoriaga Sep 11, 2025
bd38e43
revert
notoriaga Sep 11, 2025
3174c21
add bin path to clang
notoriaga Sep 11, 2025
676f578
remove ld label from linker_files
notoriaga Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions cc/toolchains/gcc_arm_embedded/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64_linux_gcc_arm_embedded_toolchain/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/gcc_arm_gnu_8_3/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/gcc_arm_gnu_8_3_toolchain/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/llvm/aarch64-darwin/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/aarch64-darwin-llvm/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/llvm/aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
toolchain_bindir=external/aarch64-linux-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-llvm/bin"

Expand All @@ -55,7 +58,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
1 change: 1 addition & 0 deletions cc/toolchains/llvm/cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ def cc_toolchain_config(
])
else:
link_flags.extend([
"-B/usr/bin", # Tell clang where to find system linker
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was the other fix needed for mac in addition to the basename thing

"-headerpad_max_install_names",
"-Wl,-no_warn_duplicate_libraries",
])
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/llvm/x86_64-aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
toolchain_bindir=external/x86_64-linux-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-llvm/bin"

Expand All @@ -55,7 +58,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
5 changes: 4 additions & 1 deletion cc/toolchains/llvm/x86_64-darwin/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
toolchain_bindir=external/x86_64-darwin-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-darwin-llvm/bin"

Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/llvm/x86_64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-linux-llvm/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/llvm20/aarch64-darwin/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/aarch64-darwin-llvm20/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
9 changes: 6 additions & 3 deletions cc/toolchains/llvm20/aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

# Locates the actual tool paths relative to the location this script is
# Locates the actual tool paths relative to the location this script is
# executed from.
#
# This is necessary because we download the toolchain using
Expand All @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/aarch64-linux-llvm20/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
9 changes: 6 additions & 3 deletions cc/toolchains/llvm20/x86_64-aarch64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

# Locates the actual tool paths relative to the location this script is
# Locates the actual tool paths relative to the location this script is
# executed from.
#
# This is necessary because we download the toolchain using
Expand All @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-linux-llvm20/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
9 changes: 6 additions & 3 deletions cc/toolchains/llvm20/x86_64-darwin/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.

# Locates the actual tool paths relative to the location this script is
# Locates the actual tool paths relative to the location this script is
# executed from.
#
# This is necessary because we download the toolchain using
Expand All @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-darwin-llvm20/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/llvm20/x86_64-linux/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/x86_64-linux-llvm20/bin
Expand All @@ -57,7 +60,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
5 changes: 4 additions & 1 deletion cc/toolchains/llvm_x86_64_windows/wrappers/wrappers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
# In case the tool label is changed, a change in here is very likely needed
# This establishes backwards compatibility with the old WORKSPACE file
toolchain_bindir=external/llvm_mingw_toolchain/bin
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/musl/aarch64/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
toolchain_bindir=external/aarch64-linux-musl/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+aarch64-linux-musl/bin"

Expand All @@ -55,7 +58,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/musl/armhf/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
toolchain_bindir=external/arm-linux-musleabihf/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+arm-linux-musleabihf/bin"

Expand All @@ -55,7 +58,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down
7 changes: 5 additions & 2 deletions cc/toolchains/musl/x86_64/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ if [ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]; then
set -x
fi

tool_name=$(basename "$0")
BASENAME=/usr/bin/basename
[ -x "$BASENAME" ] || BASENAME="basename"

tool_name=$($BASENAME "$0")
toolchain_bindir=external/x86_64-linux-musl/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav++swift_cc_toolchain_extension+x86_64-linux-musl/bin"

Expand All @@ -55,7 +58,7 @@ elif case "$0" in /*) true;; *) false;; esac; then
#
# If the wrapper is relocated then this line needs to be adjusted.

execroot_path="${0%/*/*/*/*/*/*/*/*}"
execroot_path="${0%/*/*/*/*/*/*/*/*}"

# Legacy path for non-bazelmod
tool="${execroot_path}/${toolchain_bindir}/${tool_name}"
Expand Down