diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py index 85ffb041..3c5e9aaf 100644 --- a/pmb/aportgen/binutils.py +++ b/pmb/aportgen/binutils.py @@ -45,6 +45,9 @@ def generate(args, pkgname): # remove man, info folders rm -rf "$pkgdir"/usr/share + + # remove files that conflict with non-cross binutils + rm -rf "$pkgdir"/usr/lib/bfd-plugins """, "libs": None, "gold": None, diff --git a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD index 2c416ab9..44d38192 100644 --- a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD @@ -63,6 +63,9 @@ package() { # remove man, info folders rm -rf "$pkgdir"/usr/share + + # remove files that conflict with non-cross binutils + rm -rf "$pkgdir"/usr/lib/bfd-plugins }