Merge pull request #175251 from trofi/workaround-fno-common-for-sil
sil: add -fcommon workaround
This commit is contained in:
commit
7209d1f19a
1 changed files with 6 additions and 0 deletions
|
@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
|
||||||
buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses")
|
buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Workaround build failure on -fno-common toolchains like upstream
|
||||||
|
# gcc-10. Otherwise build fails as:
|
||||||
|
# ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of
|
||||||
|
# `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here
|
||||||
|
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
# the makefile doesn't have a sensible install target, so we hav to do it ourselves
|
# the makefile doesn't have a sensible install target, so we hav to do it ourselves
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|
Loading…
Reference in a new issue