Skip to content

Declare the target_cxx value for all targets #563

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
Mar 17, 2025
Merged

Declare the target_cxx value for all targets #563

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
1e9b7ef
Declare the `target_cxx` value for all targets
zanieb Mar 17, 2025
1e23735
Revert change for musl
zanieb Mar 17, 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
2 changes: 1 addition & 1 deletion cpython-unix/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def add_target_env(env, build_platform, target_triple, build_env):
env["CC"] = settings["target_cc"]
# We always set CXX, otherwise a build could bypass our toolchain
# accidentally, e.g., on macOS where `g++` links to the system clang.
env["CXX"] = settings.get("target_cxx", settings.get("host_cxx"))
env["CXX"] = settings["target_cxx"]

if settings.get("bolt_capable"):
env["BOLT_CAPABLE"] = "1"
Expand Down
29 changes: 29 additions & 0 deletions cpython-unix/targets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
# target_cc
# Path to C compiler to use for building binaries targeting the
# target architecture.

# target_cxx
# Path to C++ compiler to use for building binaries targeting the
# target architecture.
#
# target_cflags
# List of extra compiler flags to use when building for the target.
Expand Down Expand Up @@ -69,6 +73,7 @@ aarch64-apple-darwin:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
apple_sdk_platform: macosx
target_cflags:
- '-arch'
Expand Down Expand Up @@ -114,6 +119,7 @@ aarch64-apple-ios:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'arm64'
Expand Down Expand Up @@ -159,6 +165,7 @@ aarch64-unknown-linux-gnu:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/aarch64-linux-gnu-gcc
target_cxx: /usr/bin/aarch64-linux-gnu-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -195,6 +202,7 @@ arm64-apple-tvos:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'arm64'
Expand Down Expand Up @@ -239,6 +247,7 @@ armv7-unknown-linux-gnueabi:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/arm-linux-gnueabi-gcc
target_cxx: /usr/bin/arm-linux-gnueabi-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -279,6 +288,7 @@ armv7-unknown-linux-gnueabihf:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/arm-linux-gnueabihf-gcc
target_cxx: /usr/bin/arm-linux-gnueabihf-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -319,6 +329,7 @@ i686-unknown-linux-gnu:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-m32'
- '-fvisibility=hidden'
Expand Down Expand Up @@ -364,6 +375,7 @@ mips-unknown-linux-gnu:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/mips-linux-gnu-gcc
target_cxx: /usr/bin/mips-linux-gnu-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -404,6 +416,7 @@ mipsel-unknown-linux-gnu:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/mipsel-linux-gnu-gcc
target_cxx: /usr/bin/mipsel-linux-gnu-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -444,6 +457,7 @@ ppc64le-unknown-linux-gnu:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/powerpc64le-linux-gnu-gcc
target_cxx: /usr/bin/powerpc64le-linux-gnu-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -484,6 +498,7 @@ riscv64-unknown-linux-gnu:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/riscv64-linux-gnu-gcc
target_cxx: /usr/bin/riscv64-linux-gnu-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -524,6 +539,7 @@ s390x-unknown-linux-gnu:
host_cc: /usr/bin/x86_64-linux-gnu-gcc
host_cxx: /usr/bin/x86_64-linux-gnu-g++
target_cc: /usr/bin/s390x-linux-gnu-gcc
target_cxx: /usr/bin/s390x-linux-gnu-g++
needs:
- autoconf
- bdb
Expand Down Expand Up @@ -560,6 +576,7 @@ thumb7k-apple-watchos:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'armv7k'
Expand Down Expand Up @@ -609,6 +626,7 @@ x86_64-apple-darwin:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'x86_64'
Expand Down Expand Up @@ -653,6 +671,7 @@ x86_64-apple-ios:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'x86_64'
Expand Down Expand Up @@ -694,6 +713,7 @@ x86_64-apple-tvos:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'x86_64'
Expand Down Expand Up @@ -734,6 +754,7 @@ x86_64-apple-watchos:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-arch'
- 'x86_64'
Expand Down Expand Up @@ -778,6 +799,7 @@ x86_64-unknown-linux-gnu:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-fvisibility=hidden'
# Needed to prevent BOLT from crashing.
Expand Down Expand Up @@ -823,6 +845,7 @@ x86_64_v2-unknown-linux-gnu:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-march=x86-64-v2'
- '-fvisibility=hidden'
Expand Down Expand Up @@ -869,6 +892,7 @@ x86_64_v3-unknown-linux-gnu:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-march=x86-64-v3'
- '-fvisibility=hidden'
Expand Down Expand Up @@ -915,6 +939,7 @@ x86_64_v4-unknown-linux-gnu:
host_cc: clang
host_cxx: clang++
target_cc: clang
target_cxx: clang++
target_cflags:
- '-march=x86-64-v4'
- '-fvisibility=hidden'
Expand Down Expand Up @@ -961,6 +986,7 @@ x86_64-unknown-linux-musl:
host_cc: clang
host_cxx: clang++
target_cc: musl-clang
target_cxx: clang++ # TODO: Explore a musl-clang++ shim?
target_cflags:
- '-fvisibility=hidden'
needs:
Expand Down Expand Up @@ -1004,6 +1030,7 @@ x86_64_v2-unknown-linux-musl:
host_cc: clang
host_cxx: clang++
target_cc: musl-clang
target_cxx: clang++ # TODO: Explore a musl-clang++ shim?
target_cflags:
- '-march=x86-64-v2'
- '-fvisibility=hidden'
Expand Down Expand Up @@ -1048,6 +1075,7 @@ x86_64_v3-unknown-linux-musl:
host_cc: clang
host_cxx: clang++
target_cc: musl-clang
target_cxx: clang++ # TODO: Explore a musl-clang++ shim?
target_cflags:
- '-march=x86-64-v3'
- '-fvisibility=hidden'
Expand Down Expand Up @@ -1092,6 +1120,7 @@ x86_64_v4-unknown-linux-musl:
host_cc: clang
host_cxx: clang++
target_cc: musl-clang
target_cxx: clang++ # TODO: Explore a musl-clang++ shim?
target_cflags:
- '-march=x86-64-v4'
- '-fvisibility=hidden'
Expand Down
Loading