forked from mirrors/nixpkgs
* makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
This commit is contained in:
parent
b8b44e026c
commit
f861c8b66c
|
@ -1,6 +1,6 @@
|
|||
source $stdenv/setup
|
||||
|
||||
makeFlags="-f Makefile.bmp"
|
||||
buildFlags="-f Makefile.bmp"
|
||||
|
||||
installPhase=installPhase
|
||||
installPhase() {
|
||||
|
|
|
@ -15,5 +15,5 @@ stdenv.mkDerivation {
|
|||
inherit motif;
|
||||
buildInputs = [x11 motif libXpm];
|
||||
|
||||
makeFlags = if stdenv.system == "i686-linux" then "linux" else "";
|
||||
buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
|
||||
}
|
||||
|
|
|
@ -48,6 +48,6 @@ postInstall() {
|
|||
|
||||
}
|
||||
|
||||
makeFlags="-f client.mk build"
|
||||
buildFlags="-f client.mk build"
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -68,6 +68,6 @@ preConfigure() {
|
|||
}
|
||||
|
||||
|
||||
makeFlags="bootstrap"
|
||||
buildFlags="bootstrap"
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -85,6 +85,6 @@ postConfigure() {
|
|||
postConfigure=postConfigure
|
||||
|
||||
|
||||
makeFlags="bootstrap"
|
||||
buildFlags="bootstrap"
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -79,9 +79,9 @@ postInstall() {
|
|||
|
||||
|
||||
#if test -z "$profiledCompiler"; then
|
||||
# makeFlags="bootstrap"
|
||||
# buildFlags="bootstrap"
|
||||
#else
|
||||
# makeFlags="profiledbootstrap"
|
||||
# buildFlags="profiledbootstrap"
|
||||
#fi
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -69,9 +69,9 @@ postInstall() {
|
|||
|
||||
|
||||
if test -z "$profiledCompiler"; then
|
||||
makeFlags="bootstrap $makeFlags"
|
||||
buildFlags="bootstrap $buildFlags"
|
||||
else
|
||||
makeFlags="profiledbootstrap $makeFlags"
|
||||
buildFlags="profiledbootstrap $buildFlags"
|
||||
fi
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -89,9 +89,9 @@ postInstall() {
|
|||
|
||||
|
||||
#if test -z "$profiledCompiler"; then
|
||||
#makeFlags="bootstrap"
|
||||
#buildFlags="bootstrap"
|
||||
#else
|
||||
#makeFlags="profiledbootstrap"
|
||||
#buildFlags="profiledbootstrap"
|
||||
#fi
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -92,9 +92,9 @@ postInstall() {
|
|||
|
||||
|
||||
if test -z "$profiledCompiler"; then
|
||||
makeFlags="bootstrap"
|
||||
buildFlags="bootstrap"
|
||||
else
|
||||
makeFlags="profiledbootstrap"
|
||||
buildFlags="profiledbootstrap"
|
||||
fi
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -75,9 +75,9 @@ postInstall() {
|
|||
|
||||
if test -z "$staticCompiler"; then
|
||||
if test -z "$profiledCompiler"; then
|
||||
makeFlags="bootstrap $makeFlags"
|
||||
buildFlags="bootstrap $buildFlags"
|
||||
else
|
||||
makeFlags="profiledbootstrap $makeFlags"
|
||||
buildFlags="profiledbootstrap $buildFlags"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
@ -10,6 +10,6 @@ stdenv.mkDerivation {
|
|||
configureScript = ./configure-3.08.0;
|
||||
dontAddPrefix = "True";
|
||||
configureFlags = ["-no-tk" "-x11lib" x11];
|
||||
makeFlags = ["world" "bootstrap" "opt"];
|
||||
buildFlags = ["world" "bootstrap" "opt"];
|
||||
checkTarget = ["opt.opt"];
|
||||
}
|
||||
|
|
|
@ -10,6 +10,6 @@ stdenv.mkDerivation {
|
|||
configureScript = ./configure-3.09.1;
|
||||
dontAddPrefix = "True";
|
||||
configureFlags = ["-no-tk" "-x11lib" x11];
|
||||
makeFlags = ["world" "bootstrap" "opt"];
|
||||
buildFlags = ["world" "bootstrap" "opt"];
|
||||
checkTarget = ["opt.opt"];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
source $stdenv/setup
|
||||
|
||||
makeFlags="all so sobin"
|
||||
buildFlags="all so sobin"
|
||||
installFlags="INSTALL_ROOT=$out"
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
source $stdenv/setup
|
||||
|
||||
makeFlags="all so sobin"
|
||||
buildFlags="all so sobin"
|
||||
installFlags="soinstall INSTALL_ROOT=$out"
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
source $stdenv/setup
|
||||
|
||||
makeFlags="linux-x86"
|
||||
buildFlags="linux-x86"
|
||||
|
||||
installPhase=installPhase
|
||||
installPhase() {
|
||||
|
|
|
@ -7,5 +7,5 @@ stdenv.mkDerivation {
|
|||
md5 = "a05bed4aa63637052e60690ccde70421";
|
||||
};
|
||||
buildInputs = [x11 libXaw];
|
||||
makeFlags = "without_doc";
|
||||
buildFlags = "without_doc";
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
source $stdenv/setup
|
||||
|
||||
makeFlags="-f unix/Makefile generic"
|
||||
buildFlags="-f unix/Makefile generic"
|
||||
|
||||
installFlags="-f unix/Makefile prefix=$out INSTALL=cp"
|
||||
|
||||
|
|
Loading…
Reference in a new issue