pmb.build._package: split out init_compiler function (MR 2023)

In preparation for using it outside of init_buildenv
This commit is contained in:
Luca Weiss 2021-03-10 08:29:25 +01:00 committed by Clayton Craft
parent 485b81e96e
commit 29823eec3e
No known key found for this signature in database
GPG Key ID: 7A3461CA187CEA54
3 changed files with 20 additions and 15 deletions

View File

@ -1,6 +1,6 @@
# Copyright 2021 Oliver Smith
# SPDX-License-Identifier: GPL-3.0-or-later
from pmb.build.init import init
from pmb.build.init import init, init_compiler
from pmb.build.envkernel import package_kernel
from pmb.build.menuconfig import menuconfig
from pmb.build.newapkbuild import newapkbuild

View File

@ -218,20 +218,7 @@ def init_buildenv(args, apkbuild, arch, strict=False, force=False, cross=None,
# Cross-compiler init
if cross:
cross_pkgs = ["ccache-cross-symlinks"]
if "gcc4" in depends:
cross_pkgs += ["gcc4-" + arch]
elif "gcc6" in depends:
cross_pkgs += ["gcc6-" + arch]
else:
cross_pkgs += ["gcc-" + arch, "g++-" + arch]
if "clang" in depends or "clang-dev" in depends:
cross_pkgs += ["clang"]
if cross == "crossdirect":
cross_pkgs += ["crossdirect"]
if "rust" in depends or "cargo" in depends:
cross_pkgs += ["rust"]
pmb.chroot.apk.install(args, cross_pkgs)
pmb.build.init_compiler(args, depends, cross, arch)
if cross == "distcc":
pmb.chroot.distccd.start(args, arch)
if cross == "crossdirect":

View File

@ -78,3 +78,21 @@ def init(args, suffix="native"):
# Mark the chroot as initialized
pmb.chroot.root(args, ["touch", marker], suffix)
def init_compiler(args, depends, cross, arch):
cross_pkgs = ["ccache-cross-symlinks"]
if "gcc4" in depends:
cross_pkgs += ["gcc4-" + arch]
elif "gcc6" in depends:
cross_pkgs += ["gcc6-" + arch]
else:
cross_pkgs += ["gcc-" + arch, "g++-" + arch]
if "clang" in depends or "clang-dev" in depends:
cross_pkgs += ["clang"]
if cross == "crossdirect":
cross_pkgs += ["crossdirect"]
if "rust" in depends or "cargo" in depends:
cross_pkgs += ["rust"]
pmb.chroot.apk.install(args, cross_pkgs)