From 32d7a746a20c42ea3aecc04d0d7fde6c04fc5193 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Jun 2005 11:42:53 +0000 Subject: * Move ensureDir() up, otherwise calls to fail() might fail. svn path=/nixpkgs/trunk/; revision=3192 --- pkgs/stdenv/generic/setup.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0115b78cf492..216205f4f764 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -37,6 +37,13 @@ if test -f $NIX_GCC/nix-support/setup-hook; then fi +# Ensure that the given directory exists. +ensureDir() { + local dir=$1 + if ! test -x "$dir"; then mkdir -p "$dir"; fi +} + + # Called when some build action fails. If $succeedOnFailure is set, # create the file `$out/nix-support/failed' to signal failure, and # exit normally. Otherwise, exit with failure. @@ -208,13 +215,6 @@ dumpVars() { } -# Ensure that the given directory exists. -ensureDir() { - local dir=$1 - if ! test -x "$dir"; then mkdir -p "$dir"; fi -} - - # Redirect stdout/stderr to a named pipe connected to a `tee' process # that writes the specified file (and also to our original stdout). # The original stdout is saved in descriptor 3. -- cgit 1.4.1