Merge pull request #176425 from trofi/workaround-fno-common-for-cdesktopenv

cdesktopenv: add -fcommon workaround
This commit is contained in:
Sergei Trofimovich 2022-06-07 21:15:05 +00:00 committed by GitHub
commit 4195de6685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,6 +49,11 @@ in stdenv.mkDerivation rec {
# build fails otherwise
enableParallelBuilding = false;
# Workaround build failure on -fno-common toolchains:
# ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of
# `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [
"World"
"BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"