From b0832eea407474d0312edfa21734ef12bc28404f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 29 Jul 2009 20:01:28 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 4 ++++ libiberty/make-temp-file.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 25c6cd1b77b..16f541ed275 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2009-07-29 Douglas B Rupp + + * make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS. + 2009-07-27 Douglas B Rupp * pex-unix.c (vfork): Remove VMS specific definition (get from header diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c index eadcf850213..13e19256534 100644 --- a/libiberty/make-temp-file.c +++ b/libiberty/make-temp-file.c @@ -1,5 +1,5 @@ /* Utility to pick a temporary filename prefix. - Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2001, 2009 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or @@ -111,9 +111,14 @@ choose_tmpdir (void) char *tmpdir; unsigned int len; +#ifdef VMS + /* Try VMS standard temp logical. */ + base = try_dir ("/sys$scratch", base); +#else base = try_dir (getenv ("TMPDIR"), base); base = try_dir (getenv ("TMP"), base); base = try_dir (getenv ("TEMP"), base); +#endif #ifdef P_tmpdir base = try_dir (P_tmpdir, base);