diff --git libs/context/build/Jamfile.v2 libs/context/build/Jamfile.v2 index d5e8db153..0a7363d71 100644 --- libs/context/build/Jamfile.v2 +++ libs/context/build/Jamfile.v2 @@ -821,6 +821,16 @@ alias asm_sources mach-o ; +# COMBINED +alias asm_sources + : asm/make_combined_sysv_macho_gas.S + asm/jump_combined_sysv_macho_gas.S + asm/ontop_combined_sysv_macho_gas.S + : 64 + combined + mach-o + ; + explicit asm_sources ; diff --git tools/build/src/tools/features/architecture-feature.jam tools/build/src/tools/features/architecture-feature.jam index 3fb0059f4..f8181c04b 100644 --- tools/build/src/tools/features/architecture-feature.jam +++ tools/build/src/tools/features/architecture-feature.jam @@ -44,6 +44,9 @@ feature.feature architecture # z Systems (aka s390x) s390x + + # Combined architecture(s) + combined : propagated optional ;