mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #173865 from trofi/workaround-fno-common-for-jpeg-archive
jpeg-archive: add -fcommon workaround
This commit is contained in:
commit
35e19f9daa
@ -21,6 +21,12 @@ stdenv.mkDerivation {
|
||||
substituteInPlace Makefile --replace 'LIBJPEG =' 'LIBJPEG ?='
|
||||
'';
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: src/util.o:(.bss+0x0): multiple definition of `progname'; /build/ccBZT2Za.o:(.bss+0x20): first defined here
|
||||
# https://github.com/danielgtaylor/jpeg-archive/issues/119
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"PREFIX=$(out)"
|
||||
|
Loading…
Reference in New Issue
Block a user