Commit 72cf6902 by Nick Clifton Committed by Nick Clifton

Add definition of GET_ENVIRONMENT and make prefix_from_env() use it.

From-SVN: r18801
parent 1fdb7d93
...@@ -7,7 +7,8 @@ Tue Mar 24 10:44:11 1998 Nick Clifton <nickc@cygnus.com> ...@@ -7,7 +7,8 @@ Tue Mar 24 10:44:11 1998 Nick Clifton <nickc@cygnus.com>
(main): Test for debug command line switch at start of program (main): Test for debug command line switch at start of program
execution. execution.
(main): Use GET_ENVIRONMENT rather than getenv(). (main): Use GET_ENVIRONMENT rather than getenv().
(prefix_from_env): Use GET_ENVIRONMENT.
1998-03-24 Mark Mitchell <mmitchell@usa.net> 1998-03-24 Mark Mitchell <mmitchell@usa.net>
* cplus-dem.c (optable): Add sizeof. * cplus-dem.c (optable): Add sizeof.
......
...@@ -242,9 +242,14 @@ char * temporary_firstobj; ...@@ -242,9 +242,14 @@ char * temporary_firstobj;
/* Defined in the automatically-generated underscore.c. */ /* Defined in the automatically-generated underscore.c. */
extern int prepends_underscore; extern int prepends_underscore;
extern char *getenv ();
extern char *mktemp (); extern char *mktemp ();
extern FILE *fdopen (); extern FILE *fdopen ();
#ifndef GET_ENVIRONMENT
#define GET_ENVIRONMENT(ENV_VALUE,ENV_NAME) ENV_VALUE = getenv (ENV_NAME)
#endif
/* Structure to hold all the directories in which to search for files to /* Structure to hold all the directories in which to search for files to
execute. */ execute. */
...@@ -906,7 +911,8 @@ prefix_from_env (env, pprefix) ...@@ -906,7 +911,8 @@ prefix_from_env (env, pprefix)
char *env; char *env;
struct path_prefix *pprefix; struct path_prefix *pprefix;
{ {
char *p = getenv (env); char *p;
GET_ENVIRONMENT (p, env);
if (p) if (p)
prefix_from_string (p, pprefix); prefix_from_string (p, pprefix);
...@@ -1032,7 +1038,7 @@ main (argc, argv) ...@@ -1032,7 +1038,7 @@ main (argc, argv)
In practice, collect will rarely invoke itself. This can happen now In practice, collect will rarely invoke itself. This can happen now
that we are no longer called gld. A perfect example is when running that we are no longer called gld. A perfect example is when running
gcc in a build directory that has been installed. When looking for gcc in a build directory that has been installed. When looking for
ld, we will find our installed version and believe that's the real ld. */ ld's, we will find our installed version and believe that's the real ld. */
/* We must also append COLLECT_NAME to COLLECT_NAMES to watch for the /* We must also append COLLECT_NAME to COLLECT_NAMES to watch for the
previous version of collect (the one that used COLLECT_NAME and only previous version of collect (the one that used COLLECT_NAME and only
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment