Skip to content

Commit 76be22c

Browse files
committed
Manually set the deployment target for Darwin Ninja bootstrap builds
Unlike our cmake-based builds we weren't setting an explicit target triple or deployment target, which left us open to the vagaries of the environment.
1 parent 9886aee commit 76be22c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

utils/build-script-impl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,11 @@ if [[ "${BUILD_NINJA}" ]] ; then
12721272
rm -rf "${build_dir}"
12731273
cp -r "${NINJA_SOURCE_DIR}" "${build_dir}"
12741274
if [[ $(uname -s) == "Darwin" ]]; then
1275-
(cd "${build_dir}" && env CXX=$(xcrun --sdk macosx -find clang++) CFLAGS="-isysroot $(xcrun --sdk macosx --show-sdk-path)" python ./configure.py --bootstrap)
1275+
(cd "${build_dir}" && \
1276+
env CXX=$(xcrun --sdk macosx -find clang++) \
1277+
CFLAGS="-isysroot $(xcrun --sdk macosx --show-sdk-path) -mmacosx-version-min=${DARWIN_DEPLOYMENT_VERSION_OSX}" \
1278+
LDFLAGS="-mmacosx-version-min=${DARWIN_DEPLOYMENT_VERSION_OSX}" \
1279+
python ./configure.py --bootstrap)
12761280
{ set +x; } 2>/dev/null
12771281
else
12781282
(cd "${build_dir}" && python ./configure.py --bootstrap)

0 commit comments

Comments
 (0)