Merge pull request #175260 from trofi/workaround-fno-common-for-svnfs
svnfs: add -fcommon workaround
This commit is contained in:
commit
45d7b7861d
|
@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
|
|||
export LD_LIBRARY_PATH=${subversion.out}/lib
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1";
|
||||
# -fcommon: workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of
|
||||
# `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here
|
||||
NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1 -fcommon";
|
||||
NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1";
|
||||
|
||||
meta = {
|
||||
|
|
Loading…
Reference in a new issue