svn commit: r346972 - head/lang/gcc-aux

John Marino marino at FreeBSD.org
Mon Mar 3 21:55:29 UTC 2014


Author: marino
Date: Mon Mar  3 21:55:29 2014
New Revision: 346972
URL: http://svnweb.freebsd.org/changeset/ports/346972
QAT: https://qat.redports.org/buildarchive/r346972/

Log:
  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.

Modified:
  head/lang/gcc-aux/Makefile

Modified: head/lang/gcc-aux/Makefile
==============================================================================
--- head/lang/gcc-aux/Makefile	Mon Mar  3 21:41:28 2014	(r346971)
+++ head/lang/gcc-aux/Makefile	Mon Mar  3 21:55:29 2014	(r346972)
@@ -79,11 +79,11 @@ AWKMANPAGE=		'{if ($$0 ~ /^man\/man[1-9]
 
 # 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


More information about the svn-ports-head mailing list