From owner-svn-ports-head@FreeBSD.ORG  Mon Mar  3 21:55:29 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D6882A2B;
 Mon,  3 Mar 2014 21:55:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3AEA79E;
 Mon,  3 Mar 2014 21:55:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23LtTZR040027;
 Mon, 3 Mar 2014 21:55:29 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23LtTit040026;
 Mon, 3 Mar 2014 21:55:29 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201403032155.s23LtTit040026@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Mon, 3 Mar 2014 21:55:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346972 - head/lang/gcc-aux
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 21:55:29 -0000

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