crossdirect: use native ccache, fix armhf error (!1773)
Depend on new pmaports version, where crossdirect uses the native ccache binary instead of going through the foreign arch ccache first and then going through crossdirect. Old: ccache (foreign) -> crossdirect (native) -> gcc (native) New: crossdirect (native) -> ccache (native) -> gcc (native) Set the PATH to the crossdirect binaries, and don't set CCACHE_PATH or CCACHE_COMPILERCHECK from pmbootstrap anymore. crossdirect sets the CCACHE_PATH to /native/usr/bin now, along with all other required environment variables. CCACHE_COMPILERCHECK isn't necessary anymore, because ccache will call gcc directly and therefore be able to use the file's timestamp and size directly. Also passing that would not work with the current crossdirect package.
This commit is contained in:
parent
cea6e70209
commit
794e0856be
|
@ -398,8 +398,8 @@ def run_abuild(args, apkbuild, arch, strict=False, force=False, cross=None,
|
|||
if args.verbose:
|
||||
env["DISTCC_VERBOSE"] = "1"
|
||||
if cross == "crossdirect":
|
||||
env["CCACHE_PATH"] = "/native/usr/lib/crossdirect/" + arch + ":/usr/bin"
|
||||
env["CCACHE_COMPILERCHECK"] = "string:" + get_gcc_version(args, arch)
|
||||
env["PATH"] = ":".join(["/native/usr/lib/crossdirect/" + arch,
|
||||
pmb.config.chroot_path])
|
||||
if not args.ccache:
|
||||
env["CCACHE_DISABLE"] = "1"
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ apk_keys_path = pmb_src + "/pmb/data/keys"
|
|||
apk_tools_static_min_version = "2.10.3-r1"
|
||||
|
||||
# postmarketOS aports compatibility (checked against "version" in pmaports.cfg)
|
||||
pmaports_min_version = "3"
|
||||
pmaports_min_version = "4"
|
||||
|
||||
# Version of the work folder (as asked during 'pmbootstrap init'). Increase
|
||||
# this number, whenever migration is required and provide the migration code,
|
||||
|
|
Loading…
Reference in New Issue