aboutsummaryrefslogtreecommitdiff
path: root/gcc/cccp.c
diff options
context:
space:
mode:
authorStan Cox <scox@cygnus.com>1998-03-30 14:35:36 +0000
committerStan Cox <scox@gcc.gnu.org>1998-03-30 14:35:36 +0000
commit97be8f06eb37d07c53c7aded3a1852a39c926f33 (patch)
treee9313a22370c8c46b8e43007c4f114a4f0b8718a /gcc/cccp.c
parent216be67c6f0c10191f0625806ce085e7bfa71c87 (diff)
downloadgcc-97be8f06eb37d07c53c7aded3a1852a39c926f33.zip
gcc-97be8f06eb37d07c53c7aded3a1852a39c926f33.tar.gz
gcc-97be8f06eb37d07c53c7aded3a1852a39c926f33.tar.bz2
gcc.c, cccp.c, cpplib.c, collect2.c (GET_ENVIRONMENT): Added.
From-SVN: r18914
Diffstat (limited to 'gcc/cccp.c')
-rw-r--r--gcc/cccp.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/cccp.c b/gcc/cccp.c
index a989bbe..ac7ae8a 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -83,6 +83,10 @@ extern char *rindex ();
extern char *getenv ();
#endif
+#ifndef GET_ENVIRONMENT
+#define GET_ENVIRONMENT(ENV_VALUE,ENV_NAME) ENV_VALUE = getenv (ENV_NAME)
+#endif
+
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
# define __attribute__(x)
#endif
@@ -1705,7 +1709,7 @@ main (argc, argv)
/* Some people say that CPATH should replace the standard include dirs,
but that seems pointless: it comes before them, so it overrides them
anyway. */
- cp = getenv ("CPATH");
+ GET_ENVIRONMENT (cp, "CPATH");
if (cp && ! no_standard_includes)
path_include (cp);
@@ -1888,16 +1892,16 @@ main (argc, argv)
switch ((objc << 1) + cplusplus)
{
case 0:
- epath = getenv ("C_INCLUDE_PATH");
+ GET_ENVIRONMENT (epath, "C_INCLUDE_PATH");
break;
case 1:
- epath = getenv ("CPLUS_INCLUDE_PATH");
+ GET_ENVIRONMENT (epath, "CPLUS_INCLUDE_PATH");
break;
case 2:
- epath = getenv ("OBJC_INCLUDE_PATH");
+ GET_ENVIRONMENT (epath, "OBJC_INCLUDE_PATH");
break;
case 3:
- epath = getenv ("OBJCPLUS_INCLUDE_PATH");
+ GET_ENVIRONMENT (epath, "OBJCPLUS_INCLUDE_PATH");
break;
}
/* If the environment var for this language is set,