Skip to content

Cleanup toolchain wrapper files [IO-410] #158

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 2 commits into from
Jul 4, 2025
Merged

Cleanup toolchain wrapper files [IO-410] #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f704936
Replace escaped tilde with proper path
martin4861 Jul 4, 2025
8417f2c
Fix typo
martin4861 Jul 4, 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 cc/toolchains/gcc_arm_embedded/wrappers/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~x86_64_linux_gcc_arm_embedded_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64_linux_gcc_arm_embedded_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~gcc_arm_gnu_8_3_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~gcc_arm_gnu_8_3_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~aarch64-darwin-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~aarch64-darwin-llvm/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 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 @@ -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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand Down
4 changes: 2 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 @@ -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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand Down
4 changes: 2 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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~x86_64-linux-llvm/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~x86_64-linux-llvm/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-ar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-g++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-gcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-gcov
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-nm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-objcopy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-objdump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-ranlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 additions & 2 deletions cc/toolchains/llvm_x86_64_windows/wrappers/x86_64-w64-mingw32uwp-strip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand All @@ -37,7 +37,7 @@ tool_name=$(basename "${BASH_SOURCE[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
toolchain_bindir_as_bzlmod=external/rules_swiftnav\~\~swift_cc_toolchain_extension\~llvm_mingw_toolchain/bin
toolchain_bindir_as_bzlmod="external/rules_swiftnav~~swift_cc_toolchain_extension~llvm_mingw_toolchain/bin"

if [[ -f "${toolchain_bindir}"/"${tool_name}" ]]; then
# We're running under _execroot_, call the real tool.
Expand Down
4 changes: 2 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 @@ -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 @@ -28,7 +28,7 @@

set -e

# Use --actionv_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
# Use --action_env=SWIFTNAV_VERBOSE_TOOLCHAIN to enable
if [[ -n "$SWIFTNAV_VERBOSE_TOOLCHAIN" ]]; then
set -x
fi
Expand Down
Loading
Loading