diff options
| author | John Criswell <criswell@uiuc.edu> | 2003-07-31 16:45:37 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2003-07-31 16:45:37 +0000 |
| commit | 7e54f8f3bf6e3c0817c4ed77352eadb617b05413 (patch) | |
| tree | 265fc7e97ada1cb0d6528c49d8d3b9db22dce4f3 /llvm | |
| parent | 121a128d40c887fac5f06eb2fd9d61fca8130965 (diff) | |
| download | bcm5719-llvm-7e54f8f3bf6e3c0817c4ed77352eadb617b05413.tar.gz bcm5719-llvm-7e54f8f3bf6e3c0817c4ed77352eadb617b05413.zip | |
Changed the default location of OBJ_ROOT to follow these rules:
1. If USER is defined and localhome/$USER is a directory, set OBJ_ROOT
to /localhome/$USER
2. Otherwise, set OBJ_ROOT to .
This should hopefully fix the nightly tester.
llvm-svn: 7451
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/autoconf/configure.ac | 9 | ||||
| -rwxr-xr-x | llvm/configure | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 19e18b2c1bf..6073f4fc78b 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -311,9 +311,14 @@ dnl Location of the purify program AC_ARG_WITH(purify,AC_HELP_STRING([--with-purify],[Location of purify program]),AC_SUBST(PURIFY,[$withval])) dnl Location for placing object files and built programs, libraries, etc -if test -d /localhome +if test ${USER} then - AC_SUBST(OBJROOT,[/localhome/$USER]) + if test -d /localhome/${USER} + then + AC_SUBST(OBJROOT,[/localhome/${USER}]) + else + AC_SUBST(OBJROOT,[.]) + fi else AC_SUBST(OBJROOT,[.]) fi diff --git a/llvm/configure b/llvm/configure index ec697bec0ee..af7852c9a0c 100755 --- a/llvm/configure +++ b/llvm/configure @@ -22079,10 +22079,16 @@ if test "${with_purify+set}" = set; then fi; -if test -d /localhome +if test ${USER} then - OBJROOT=/localhome/$USER + if test -d /localhome/${USER} + then + OBJROOT=/localhome/${USER} + + else + OBJROOT=. + fi else OBJROOT=. |
