Skip to content
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

Jump to bottom

Mark gcc as gcc instead of compiler in Unix CC toolchain #16297

Closed
wants to merge 1 commit into from
Closed

Mark gcc as gcc instead of compiler in Unix CC toolchain #16297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 47 additions & 0 deletions src/test/shell/bazel/cc_integration_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,4 +1708,51 @@ EOF
expect_log "in pkg/library.cpp: ''"
}

function test_compiler_flag_gcc() {
# The default macOS toolchain always uses XCode's clang.
[ "$PLATFORM" != "darwin" ] || return 0
type -P gcc || return 0

cat > BUILD.bazel <<'EOF'
config_setting(
name = "gcc_compiler",
flag_values = {"@bazel_tools//tools/cpp:compiler": "gcc"},
)

cc_binary(
name = "main",
srcs = select({":gcc_compiler": ["main.cc"]}),
)
EOF
cat > main.cc <<'EOF'
int main() {}
EOF

bazel build //:main --repo_env=CC=gcc || fail "Expected compiler flag to have value 'gcc'"
}

function test_compiler_flag_clang() {
# TODO: The default toolchain always uses XCode's clang, but sets the compiler name to the generic
Copy link
Member

Choose a reason for hiding this comment

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

If you force using the C++ only toolchain on macOS this would likely pass, although maybe it still shouldn't

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I briefly went over the control flow and it seemed as if the fallback to the Unix toolchain would only be picked if Xcode couldn't be find. I have a follow-up PR where I will dig deeper into the macOS case.

# "compiler".
[ "$PLATFORM" != "darwin" ] || return 0
type -P clang || return 0

cat > BUILD.bazel <<'EOF'
config_setting(
name = "clang_compiler",
flag_values = {"@bazel_tools//tools/cpp:compiler": "clang"},
)

cc_binary(
name = "main",
srcs = select({":clang_compiler": ["main.cc"]}),
)
EOF
cat > main.cc <<'EOF'
int main() {}
EOF

bazel build //:main --repo_env=CC=clang || fail "Expected compiler flag to have value 'clang'"
}

run_suite "cc_integration_test"
14 changes: 13 additions & 1 deletion tools/cpp/unix_cc_configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,18 @@ def _coverage_flags(repository_ctx, darwin):
def _is_clang(repository_ctx, cc):
return "clang" in repository_ctx.execute([cc, "-v"]).stderr

def _is_gcc(repository_ctx, cc):
# GCC's version output uses the basename of argv[0] as the program name:
# https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.cc;h=158461167951c1b9540322fb19be6a89d6da07fc;hb=HEAD#l8728
return repository_ctx.execute([cc, "--version"]).stdout.startswith("gcc ")

def _get_compiler_name(repository_ctx, cc):
if _is_clang(repository_ctx, cc):
return "clang"
if _is_gcc(repository_ctx, cc):
return "gcc"
return "compiler"

def _find_generic(repository_ctx, name, env_name, overriden_tools, warn = False, silent = False):
"""Find a generic C++ toolchain tool. Doesn't %-escape the result."""

Expand Down Expand Up @@ -492,7 +504,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):
"%{compiler}": escape_string(get_env_var(
repository_ctx,
"BAZEL_COMPILER",
"clang" if is_clang else "compiler",
_get_compiler_name(repository_ctx, cc),
False,
)),
"%{abi_version}": escape_string(get_env_var(
Expand Down