Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2013 22:20:45 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
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++
Message-ID:  <201303152220.r2FMKj12092526@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303152220.r2FMKj12092526>