synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pmb.build.menuconfig: fix for native arch case (MR 2041) 

Don't try to install and use a cross compiler if none is needed.

Fixes: 2406597f ("menuconfig: use cross-compiler for configuration (MR 2023)")
This commit is contained in:
Oliver Smith 2021-03-30 15:46:32 +02:00
parent 88ec1d1106
commit a440556a0a
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pmb/build/menuconfig.py
View File

@ -97,7 +97,8 @@ def menuconfig(args, pkgname):
# Set up build tools and makedepends
pmb.build.init(args, suffix)
pmb.build.init_compiler(args, [], cross, arch)
if cross:
pmb.build.init_compiler(args, [], cross, arch)
depends = apkbuild["makedepends"]
kopt = "menuconfig"
copy_xauth = False
@ -128,13 +129,14 @@ def menuconfig(args, pkgname):
# Run make menuconfig
outputdir = get_outputdir(args, pkgname, apkbuild)
logging.info("(native) make " + kopt)
env = {"ARCH": pmb.parse.arch.alpine_to_kernel(arch),
"DISPLAY": os.environ.get("DISPLAY"),
"XAUTHORITY": "/home/pmos/.Xauthority"}
if cross:
env["CROSS_COMPILE"] = f"{hostspec}-"
env["CC"] = f"{hostspec}-gcc"
pmb.chroot.user(args, ["make", kopt], "native",
outputdir, output="tui",
env={"ARCH": pmb.parse.arch.alpine_to_kernel(arch),
"DISPLAY": os.environ.get("DISPLAY"),
"XAUTHORITY": "/home/pmos/.Xauthority",
"CROSS_COMPILE": hostspec + "-",
"CC": hostspec + "-gcc"})
outputdir, output="tui", env=env)
# Find the updated config
source = args.work + "/chroot_native" + outputdir + "/.config"