From 17728ee4ae4d2caa0a10ea31bbe90e8208f7922d Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Fri, 12 May 2023 19:56:30 +0100 Subject: [PATCH] Remove cmake and ninja from the final toolchain --- builder | 2 -- packages/stage3-bundle/conanfile.py | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/builder b/builder index cb2e157..8778ed8 100755 --- a/builder +++ b/builder @@ -178,8 +178,6 @@ function build-stage2() { ## Build the stage2 compiler and sysroot # final toolchain function build-stage3() { ## Build the stage3 compiler and sysroot _build iwyu 2 - _build cmake 2 - _build ninja 2 _build toolchain 2 _build boehmgc 2 _build stage3-bundle 2 diff --git a/packages/stage3-bundle/conanfile.py b/packages/stage3-bundle/conanfile.py index feec53a..b78b20f 100644 --- a/packages/stage3-bundle/conanfile.py +++ b/packages/stage3-bundle/conanfile.py @@ -40,14 +40,12 @@ class Stage3(ConanFile): self.requires(f"zlib/{get_version('zlib')}@{self.user}/{self.channel}") self.requires(f"zstd/{get_version('zstd')}@{self.user}/{self.channel}") self.requires(f"musl/{get_version('musl')}@{self.user}/{self.channel}") - self.requires(f"cmake/{get_version('cmake')}@{self.user}/{self.channel}") - self.requires(f"ninja/{get_version('ninja')}@{self.user}/{self.channel}") self.requires(f"boehmgc/{get_version('boehmgc')}@{self.user}/{self.channel}") def build(self): copy_dependency_tree( self, - ["toolchain", "musl", "zlib", "zstd", "boehmgc", "cmake", "ninja"], + ["toolchain", "musl", "zlib", "zstd", "boehmgc"], self.package_folder, )