From 0db9a736ba169e70dc29b9bf108495fee7243f8e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 25 Apr 2022 22:06:32 -0500 Subject: [PATCH] Bring back one combined arch use case. In the cleanup of the darwin toolset we eliminated the cimbined architecture option. Until we implement a better combined architecture model add back the one use case in current demand. That is the macOS arm64+x86_64 unity build. As such this adds a single "arm+x86" architecture and corresponding common handling to add the gcc toolset options for macOS. --- src/tools/features/architecture-feature.jam | 3 +++ src/tools/gcc.jam | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/tools/features/architecture-feature.jam b/src/tools/features/architecture-feature.jam index 3c9d92f32..a47c4bfdc 100644 --- a/src/tools/features/architecture-feature.jam +++ b/src/tools/features/architecture-feature.jam @@ -47,6 +47,9 @@ feature.feature architecture # z Systems (aka s390x) s390x + + # Combined architecture(s) + arm+x86 : propagated optional ; diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam index 4843716a0..943cba0b9 100644 --- a/src/tools/gcc.jam +++ b/src/tools/gcc.jam @@ -1272,3 +1272,8 @@ cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; # AIX variant of RS/6000 & PowerPC toolset.flags gcc AROPTIONS 64/aix : "-X64" ; + +# This is a remporary solution for doing combined architecture builds on macOS. +toolset.flags gcc + OPTIONS darwin/arm+x86/64 + : "-arch arm64" "-arch x86_64" ;