From owner-svn-src-stable-9@FreeBSD.ORG  Fri Mar 15 22:20:45 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B0524BC8;
 Fri, 15 Mar 2013 22:20:45 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A0DC8B23;
 Fri, 15 Mar 2013 22:20:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FMKjTo092527;
 Fri, 15 Mar 2013 22:20:45 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FMKj12092526;
 Fri, 15 Mar 2013 22:20:45 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201303152220.r2FMKj12092526@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 15 Mar 2013 22:20:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r248355 - stable/9/gnu/usr.bin/cc/c++
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 22:20:45 -0000

Author: brooks
Date: Fri Mar 15 22:20:45 2013
New Revision: 248355
URL: http://svnweb.freebsd.org/changeset/base/248355

Log:
  MFC r245882,245898
  
  Reorder so that NO_MAN is declared before bsd.own.mk is included and thus
  has an effect (not installed a g++.1 manpage over the g++.1(.gz) link
  created in ../cc).
  
  bsd.own.mk needs to be included before Makefil.inc so MK_ARM_EABI is defined

Modified:
  stable/9/gnu/usr.bin/cc/c++/Makefile
Directory Properties:
  stable/9/gnu/usr.bin/cc/c++/   (props changed)

Modified: stable/9/gnu/usr.bin/cc/c++/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/cc/c++/Makefile	Fri Mar 15 22:14:41 2013	(r248354)
+++ stable/9/gnu/usr.bin/cc/c++/Makefile	Fri Mar 15 22:20:45 2013	(r248355)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+NO_MAN=
 .include <bsd.own.mk>
 
 .include "../Makefile.inc"
@@ -9,13 +10,13 @@
 
 PROG=	g++
 SRCS+=	g++spec.c
+
+DPADD=	${LIBCPP} ${LIBIBERTY}
+LDADD=	${LIBCPP} ${LIBIBERTY}
+
 .if ${MK_CLANG_IS_CC} == "no"
 LINKS=	${BINDIR}/g++ ${BINDIR}/c++
 LINKS+=	${BINDIR}/g++ ${BINDIR}/CC
 .endif
-NO_MAN=
-
-DPADD=	${LIBCPP} ${LIBIBERTY}
-LDADD=	${LIBCPP} ${LIBIBERTY}
 
 .include <bsd.prog.mk>