mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #174023 from trofi/workaround-fno-common-for-oonf-olsrd2
oonf-olsrd2: add -fcommon workaround
This commit is contained in:
commit
497a37dcea
@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0=";
|
||||
};
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: CMakeFiles/oonf_dlep_proxy.dir/router/dlep_router_session.c.o:(.bss+0x0):
|
||||
# multiple definition of `LOG_DLEP_ROUTER'; CMakeFiles/oonf_dlep_proxy.dir/router/dlep_router.c.o:(.bss+0x0): first defined here
|
||||
# Can be removed once release with https://github.com/OLSR/OONF/pull/40 is out.
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOONF_NO_WERROR=yes"
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user