Merge pull request #172998 from trofi/workaround-fno-common-for-eukleides
eukleides: add -fcommon workaround
This commit is contained in:
commit
68f3647eae
1 changed files with 6 additions and 0 deletions
|
@ -32,6 +32,12 @@ lib.fix (eukleides: stdenv.mkDerivation rec {
|
||||||
--replace '$(SHARE_DIR)/texmf' "$tex"
|
--replace '$(SHARE_DIR)/texmf' "$tex"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Workaround build failure on -fno-common toolchains like upstream
|
||||||
|
# gcc-10. Otherwise build fails as:
|
||||||
|
# ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A';
|
||||||
|
# eukleides_build/quadrilateral.o:(.bss+0x18): first defined here
|
||||||
|
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue