Remove cmake and ninja from the final toolchain
This commit is contained in:
parent
7e8acf3213
commit
17728ee4ae
2
builder
2
builder
|
@ -178,8 +178,6 @@ function build-stage2() { ## Build the stage2 compiler and sysroot
|
||||||
# final toolchain
|
# final toolchain
|
||||||
function build-stage3() { ## Build the stage3 compiler and sysroot
|
function build-stage3() { ## Build the stage3 compiler and sysroot
|
||||||
_build iwyu 2
|
_build iwyu 2
|
||||||
_build cmake 2
|
|
||||||
_build ninja 2
|
|
||||||
_build toolchain 2
|
_build toolchain 2
|
||||||
_build boehmgc 2
|
_build boehmgc 2
|
||||||
_build stage3-bundle 2
|
_build stage3-bundle 2
|
||||||
|
|
|
@ -40,14 +40,12 @@ class Stage3(ConanFile):
|
||||||
self.requires(f"zlib/{get_version('zlib')}@{self.user}/{self.channel}")
|
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"zstd/{get_version('zstd')}@{self.user}/{self.channel}")
|
||||||
self.requires(f"musl/{get_version('musl')}@{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}")
|
self.requires(f"boehmgc/{get_version('boehmgc')}@{self.user}/{self.channel}")
|
||||||
|
|
||||||
def build(self):
|
def build(self):
|
||||||
copy_dependency_tree(
|
copy_dependency_tree(
|
||||||
self,
|
self,
|
||||||
["toolchain", "musl", "zlib", "zstd", "boehmgc", "cmake", "ninja"],
|
["toolchain", "musl", "zlib", "zstd", "boehmgc"],
|
||||||
self.package_folder,
|
self.package_folder,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue