From 54ac8b11a1106303ba2a1c0a01174ac38d1ff3f6 Mon Sep 17 00:00:00 2001 From: John Criswell Date: Thu, 31 Jul 2003 16:45:37 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7451 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 9 +++++++-- configure | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 19e18b2c1bf..6073f4fc78b 100644 --- a/autoconf/configure.ac +++ b/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/configure b/configure index ec697bec0ee..af7852c9a0c 100755 --- a/configure +++ b/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=.