diff options
Diffstat (limited to 'lang/icc7/files')
| -rw-r--r-- | lang/icc7/files/ld.c | 10 | ||||
| -rw-r--r-- | lang/icc7/files/patch-ia32::bin::icc | 4 | ||||
| -rw-r--r-- | lang/icc7/files/patch-ia32::bin::icpc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lang/icc7/files/ld.c b/lang/icc7/files/ld.c index a55671768e79..aa184e484658 100644 --- a/lang/icc7/files/ld.c +++ b/lang/icc7/files/ld.c @@ -76,7 +76,7 @@ main(int argc, char *argv[], char *envp[]) { size_t i; u_int flags; - const char *libc, *libthr, *prefix; + const char *libc, *libthr, *icc_localbase; struct arglist al = { 0, NULL }; flags = 0; @@ -84,8 +84,8 @@ main(int argc, char *argv[], char *envp[]) if (argc == 1) errx(1, "no input files"); - if ((prefix = getenv("PREFIX")) == NULL) - errx(1, "can't get PREFIX"); + if ((icc_localbase = getenv("ICC_LOCALBASE")) == NULL) + errx(1, "can't get ICC_LOCALBASE"); #ifdef DEBUG printf("input: "); @@ -247,7 +247,7 @@ main(int argc, char *argv[], char *envp[]) addarg(&al, "-L/usr/lib"); if (flags & LDW_CPP) { char *p; - asprintf(&p, "-L%s/lib", prefix); + asprintf(&p, "-L%s/lib", icc_localbase); if (p == NULL) err(1, NULL); addarg(&al, p); @@ -273,7 +273,7 @@ main(int argc, char *argv[], char *envp[]) /* Don't add superfluous -Bstatic. */ if (ARGCMP(i, "-Bstatic") && i < argc - 1 && - (ARGCMP(i + 1, "-lcprts") || ARGCMP(i + 1, "-lunwind"))) + (ARGCMP(i + 1, "-lcprts") || ARGCMP(i + 1, "-lunwind"))) continue; /* diff --git a/lang/icc7/files/patch-ia32::bin::icc b/lang/icc7/files/patch-ia32::bin::icc index 69b3e4ff1c13..a671913fa720 100644 --- a/lang/icc7/files/patch-ia32::bin::icc +++ b/lang/icc7/files/patch-ia32::bin::icc @@ -4,8 +4,8 @@ #!/bin/sh -if [ -z INTEL_LICENSE_FILE ] -+PREFIX=@@PREFIX@@ -+export PREFIX; ++ICC_LOCALBASE=%%ICC_LOCALBASE%% ++export ICC_LOCALBASE; + +if [ -z "$INTEL_LICENSE_FILE" ] then diff --git a/lang/icc7/files/patch-ia32::bin::icpc b/lang/icc7/files/patch-ia32::bin::icpc index 0557997d9a8b..2777cf0bb24e 100644 --- a/lang/icc7/files/patch-ia32::bin::icpc +++ b/lang/icc7/files/patch-ia32::bin::icpc @@ -4,8 +4,8 @@ #!/bin/sh -if [ -z INTEL_LICENSE_FILE ] -+PREFIX=@@PREFIX@@ -+export PREFIX; ++ICC_LOCALBASE=%%ICC_LOCALBASE%% ++export ICC_LOCALBASE; + +if [ -z "$INTEL_LICENSE_FILE" ] then |