Merge pull request #175246 from trofi/workaround-fno-common-for-sasquatch

sasquatch: add -fcommon workaround
This commit is contained in:
Sandro 2022-06-03 20:43:14 +02:00 committed by GitHub
commit 2dd45b41c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,6 +49,12 @@ stdenv.mkDerivation rec {
cd squashfs-tools
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of
# `verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installFlags = [ "INSTALL_DIR=\${out}/bin" ];
makeFlags = [