Skip to content

Commit 7378afd

Browse files
authored
Pass -isysroot to both CFLAGS and LDFLAGS when building ninja (swiftlang#33414)
* Pass -isysroot to both CFLAGS and LDFLAGS when building ninja * Update test expectations too
1 parent 21b91cd commit 7378afd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/swift_build_support/swift_build_support/products/ninja.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def build(self):
6363
"-isysroot {sysroot} -mmacosx-version-min={osx_version}"
6464
).format(sysroot=sysroot, osx_version=osx_version_min),
6565
"LDFLAGS": (
66-
"-mmacosx-version-min={osx_version}"
67-
).format(osx_version=osx_version_min),
66+
"-isysroot {sysroot} -mmacosx-version-min={osx_version}"
67+
).format(sysroot=sysroot, osx_version=osx_version_min),
6868
}
6969
elif self.toolchain.cxx:
7070
env = {

utils/swift_build_support/tests/products/test_ninja.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def test_build(self):
101101
"env "
102102
"'CFLAGS=-isysroot {sysroot} -mmacosx-version-min=10.9' "
103103
"CXX={cxx} "
104-
"LDFLAGS=-mmacosx-version-min=10.9 "
104+
"'LDFLAGS=-isysroot {sysroot} -mmacosx-version-min=10.9' "
105105
).format(
106106
cxx=self.toolchain.cxx,
107107
sysroot=xcrun.sdk_path('macosx')

0 commit comments

Comments
 (0)