Merge pull request #80034 from etcwilde/ewilde/ninja-build-fix

[build-script] Build Ninja with CMake

Author: etcwilde

utils/swift_build_support/swift_build_support/products/ninja.py

@@ -15,11 +15,8 @@
 # ----------------------------------------------------------------------------
 
 import os.path
-import platform
-import sys
 
 from build_swift.build_swift import cache_utils
-from build_swift.build_swift.wrappers import xcrun
 
 from . import product
 from .. import shell
@@ -55,29 +52,11 @@ def ninja_bin_path(self):
     def build(self):
         if os.path.exists(self.ninja_bin_path):
             return
-
-        env = None
-        if platform.system() == "Darwin":
-            sysroot = xcrun.sdk_path("macosx")
-            assert sysroot is not None
-            env = {
-                "CXX": shell._quote(self.toolchain.cxx),
-                "CFLAGS": (
-                    "-isysroot {sysroot}"
-                ).format(sysroot=shell._quote(sysroot)),
-                "LDFLAGS": (
-                    "-isysroot {sysroot}"
-                ).format(sysroot=shell._quote(sysroot)),
-            }
-        elif self.toolchain.cxx:
-            env = {
-                "CXX": shell._quote(self.toolchain.cxx),
-            }
-
-        # Ninja can only be built in-tree.  Copy the source tree to the build
-        # directory.
-        shell.rmtree(self.build_dir)
-        shell.copytree(self.source_dir, self.build_dir, ignore_pattern=".git")
-        with shell.pushd(self.build_dir):
-            shell.call([sys.executable, 'configure.py', '--bootstrap'],
-                       env=env)
+        shell.call([
+            self.toolchain.cmake,
+            "-S", self.source_dir,
+            "-B", self.build_dir,
+            "-DCMAKE_BUILD_TYPE=Release",
+            f"-DCMAKE_C_COMPILER={self.toolchain.cc}",
+            f"-DCMAKE_CXX_COMPILER={self.toolchain.cxx}"])
+        shell.call([self.toolchain.cmake, "--build", self.build_dir])

utils/swift_build_support/tests/products/test_ninja.py

@@ -18,8 +18,6 @@
 import unittest
 from io import StringIO
 
-from build_swift.build_swift.wrappers import xcrun
-
 from swift_build_support import shell
 from swift_build_support.products import Ninja
 from swift_build_support.targets import StdlibDeploymentTarget
@@ -90,37 +88,15 @@ def test_build(self):
 
         ninja_build.build()
 
-        expect_env = ""
-        if platform.system() == "Darwin":
-            expect_env = (
-                "env "
-                "'CFLAGS=-isysroot {sysroot}' "
-                "CXX={cxx} "
-                "'LDFLAGS=-isysroot {sysroot}' "
-            ).format(
-                cxx=self.toolchain.cxx,
-                sysroot=xcrun.sdk_path('macosx')
-            )
-        elif self.toolchain.cxx:
-            expect_env = (
-                "env "
-                "CXX={cxx} "
-            ).format(
-                cxx=self.toolchain.cxx,
-            )
-
-        self.assertEqual(self.stdout.getvalue(), """\
-+ rm -rf {build_dir}
-+ cp -r {source_dir} {build_dir}
-+ pushd {build_dir}
-+ {expect_env}{python} configure.py --bootstrap
-+ popd
-""".format(source_dir=self._platform_quote(
-            self.workspace.source_dir('ninja')),
-           build_dir=self._platform_quote(
-            self.workspace.build_dir('build', 'ninja')),
-           expect_env=expect_env,
-           python=self._platform_quote(sys.executable)))
+        self.assertEqual(self.stdout.getvalue(), f"""\
++ {self.toolchain.cmake} \
+-S {self.workspace.source_dir('ninja')} \
+-B {self.workspace.build_dir('build', 'ninja')} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_C_COMPILER=/path/to/cc \
+-DCMAKE_CXX_COMPILER=/path/to/cxx
++ {self.toolchain.cmake} --build {self.workspace.build_dir('build', 'ninja')}
+""")
 
     def _platform_quote(self, path):
         if platform.system() == 'Windows':