diff options
| author | John Marino <marino@FreeBSD.org> | 2014-03-03 21:55:29 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-03-03 21:55:29 +0000 |
| commit | 8e15a19a07ea23798bf5abe36fdcf304dac4ae7d (patch) | |
| tree | 6ceb2d4d005bee09e780ab15a4a10ecb9b6939cd /lang/gcc-aux | |
| parent | - Update to version 0.10 (diff) | |
lang/gcc-aux: Fix skip-bootstrap functionality
I don't know when the skip-bootstrap logic stopped working, but I'm
reasonably sure it did once. Apparently PREFIX isn't defined at the
time of the "if exists" evaluation. Using LOCALBASE instead will allow
the compiler to build using the compiler on the system rather than
the older bootstrap compiler. The bug was discovered while trying to
move gcc-aux to a gcc49 base.
Notes
Notes:
svn path=/head/; revision=346972
Diffstat (limited to 'lang/gcc-aux')
| -rw-r--r-- | lang/gcc-aux/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile index 6b3dd8b1e020..d15795641af4 100644 --- a/lang/gcc-aux/Makefile +++ b/lang/gcc-aux/Makefile @@ -79,11 +79,11 @@ AWKMANPAGE= '{if ($$0 ~ /^man\/man[1-9]\/.+[1-9]$$/) print $$0 ".gz"; else prin # If we find gnatmake and friends in a standard location, then we'll use this # compiler instead of downloading the bootstrap. -.if exists (${PREFIX}/${PORTNAME}/bin/ada) -.if exists (${PREFIX}/${PORTNAME}/bin/gnatbind) -.if exists (${PREFIX}/${PORTNAME}/bin/gnatlink) -.if exists (${PREFIX}/${PORTNAME}/bin/gnatmake) -FULL_GNATGCC=${PREFIX}/${PORTNAME}/bin/ada +.if exists (${LOCALBASE}/${PORTNAME}/bin/ada) +.if exists (${LOCALBASE}/${PORTNAME}/bin/gnatbind) +.if exists (${LOCALBASE}/${PORTNAME}/bin/gnatlink) +.if exists (${LOCALBASE}/${PORTNAME}/bin/gnatmake) +FULL_GNATGCC=${LOCALBASE}/${PORTNAME}/bin/ada FULL_PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/${PORTNAME}/bin:${PREFIX}/bin .endif .endif |