gcc.c, cccp.c, cpplib.c, collect2.c (GET_ENVIRONMENT): Added.

From-SVN: r18914

1 files changed, 8 insertions, 4 deletions

diff --git a/gcc/gcc.c b/gcc/gcc.c
index d68f404..ac0b36c 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -122,6 +122,10 @@ static char dir_separator_str[] = {DIR_SEPARATOR, 0};
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
 
+#ifndef GET_ENVIRONMENT
+#define GET_ENVIRONMENT(ENV_VALUE,ENV_NAME) ENV_VALUE = getenv (ENV_NAME)
+#endif
+
 extern char *choose_temp_base PROTO((void));
 
 #ifndef HAVE_STRERROR
@@ -2358,7 +2362,7 @@ process_command (argc, argv)
   int have_o = 0;
   int lang_n_infiles = 0;
 
-  gcc_exec_prefix = getenv ("GCC_EXEC_PREFIX");
+  GET_ENVIRONMENT (gcc_exec_prefix, "GCC_EXEC_PREFIX");
 
   n_switches = 0;
   n_infiles = 0;
@@ -2400,7 +2404,7 @@ process_command (argc, argv)
   /* COMPILER_PATH and LIBRARY_PATH have values
      that are lists of directory names with colons.  */
 
-  temp = getenv ("COMPILER_PATH");
+  GET_ENVIRONMENT (temp, "COMPILER_PATH");
   if (temp)
     {
       char *startp, *endp;
@@ -2434,7 +2438,7 @@ process_command (argc, argv)
 	}
     }
 
-  temp = getenv ("LIBRARY_PATH");
+  GET_ENVIRONMENT (temp, "LIBRARY_PATH");
   if (temp && *cross_compile == '0')
     {
       char *startp, *endp;
@@ -2467,7 +2471,7 @@ process_command (argc, argv)
     }
 
   /* Use LPATH like LIBRARY_PATH (for the CMU build program).  */
-  temp = getenv ("LPATH");
+  GET_ENVIRONMENT (temp, "LPATH");
   if (temp && *cross_compile == '0')
     {
       char *startp, *endp;