mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
tree: OBJS+=... doesn't work on the make command line, use EXTRA_OBJS variable instead
svn path=/nixpkgs/trunk/; revision=27919
This commit is contained in:
parent
3415f0f088
commit
31d1abd4a1
|
@ -10,9 +10,9 @@ let
|
||||||
if stdenv.isDarwin then ''
|
if stdenv.isDarwin then ''
|
||||||
CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
|
CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
OBJS+=strverscmp.o
|
EXTRA_OBJS=strverscmp.o
|
||||||
'' else
|
'' else
|
||||||
"";
|
""; # use linux flags by default
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "tree-${version}";
|
name = "tree-${version}";
|
||||||
|
@ -23,6 +23,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
|
||||||
makeFlagsArray=(
|
makeFlagsArray=(
|
||||||
prefix=$out
|
prefix=$out
|
||||||
MANDIR=$out/share/man/man1
|
MANDIR=$out/share/man/man1
|
||||||
|
|
Loading…
Reference in a new issue