mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-26 14:04:52 +00:00
svnfs: add -fcommon workaround
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
This commit is contained in:
parent
0831857a14
commit
7d92eea1c9
@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
|
|||||||
export LD_LIBRARY_PATH=${subversion.out}/lib
|
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";
|
NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
Reference in New Issue
Block a user