Skip to content

Commit 0de45b0

Browse files
committed
[Build] Pass missing build parameters
Some parameters were accidentally dropped with the introduction of #38507. rdar://103080745
1 parent 62b26b1 commit 0de45b0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,11 @@ def convert_to_impl_arguments(self):
176176
product_name, ' '.join(cmake_opts))
177177
]
178178

179+
if args.build_toolchain_only:
180+
impl_args += [
181+
"--build-toolchain-only=1"
182+
]
183+
179184
if args.build_stdlib_deployment_targets:
180185
impl_args += [
181186
"--build-stdlib-deployment-targets", " ".join(

utils/swift_build_support/swift_build_support/products/cmake_product.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,16 @@ def build_with_cmake(self, build_targets, build_type, build_args,
9191
shell.call(["env"] + cmake_build + cmake_opts)
9292

9393
shell.call(
94-
["env"] + cmake_build + cmake_opts + ["--"] + build_args + build_targets
94+
["env"] + cmake_build + cmake_opts + ["--"] + build_args
95+
+ _cmake.build_args() + build_targets
9596
)
9697

9798
def test_with_cmake(self, executable_target, results_targets,
9899
build_type, build_args, test_env=None):
99100
assert self.toolchain.cmake is not None
100101
cmake_build = []
102+
_cmake = cmake.CMake(self.args, self.toolchain,
103+
prefer_just_built_toolchain)
101104

102105
if self.toolchain.distcc_pump:
103106
cmake_build.append(self.toolchain.distcc_pump)
@@ -110,7 +113,7 @@ def test_with_cmake(self, executable_target, results_targets,
110113

111114
cmake_args = [self.toolchain.cmake, "--build", self.build_dir,
112115
"--config", build_type, "--"]
113-
cmake_build.extend(cmake_args + build_args)
116+
cmake_build.extend(cmake_args + build_args + _cmake.build_args())
114117

115118
def target_flag(target):
116119
if self.args.cmake_generator == "Xcode":

0 commit comments

Comments
 (0)