_9base: move flags to env
This commit is contained in:
parent
b07ef31a8b
commit
86a86c1692
1 changed files with 3 additions and 3 deletions
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
NIX_CFLAGS_COMPILE = [
|
env.NIX_CFLAGS_COMPILE = toString ([
|
||||||
# workaround build failure on -fno-common toolchains like upstream
|
# workaround build failure on -fno-common toolchains like upstream
|
||||||
# gcc-10. Otherwise build fails as:
|
# gcc-10. Otherwise build fails as:
|
||||||
# ld: diffio.o:(.bss+0x16): multiple definition of `bflag'; diffdir.o:(.bss+0x6): first defined here
|
# ld: diffio.o:(.bss+0x16): multiple definition of `bflag'; diffdir.o:(.bss+0x6): first defined here
|
||||||
|
@ -50,8 +50,8 @@ stdenv.mkDerivation {
|
||||||
] ++ lib.optionals stdenv.cc.isClang [
|
] ++ lib.optionals stdenv.cc.isClang [
|
||||||
# error: call to undeclared function 'p9mbtowc'; ISO C99 and later do not support implicit function declarations
|
# error: call to undeclared function 'p9mbtowc'; ISO C99 and later do not support implicit function declarations
|
||||||
"-Wno-error=implicit-function-declaration"
|
"-Wno-error=implicit-function-declaration"
|
||||||
];
|
]);
|
||||||
LDFLAGS = lib.optionalString enableStatic "-static";
|
env.LDFLAGS = lib.optionalString enableStatic "-static";
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"PREFIX=${placeholder "out"}"
|
"PREFIX=${placeholder "out"}"
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue