From owner-p4-projects@FreeBSD.ORG Wed Jul 12 02:45:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCF4416A568; Wed, 12 Jul 2006 02:45:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA38D16A4DA for ; Wed, 12 Jul 2006 02:45:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6151243D49 for ; Wed, 12 Jul 2006 02:45:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6C2jbUk045670 for ; Wed, 12 Jul 2006 02:45:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6C2jacP045666 for perforce@freebsd.org; Wed, 12 Jul 2006 02:45:36 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Jul 2006 02:45:36 GMT Message-Id: <200607120245.k6C2jacP045666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 101321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jul 2006 02:45:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=101321 Change 101321 by jb@jb_freebsd2 on 2006/07/12 02:45:00 Convert to using the new make knobs now that the parent Makefile.inc includes bsd.own.mk which expects to use the new knobs. Affected files ... .. //depot/projects/dtrace/src/gnu/usr.bin/cc/c++/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/c++filt/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1obj/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1plus/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/f771/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/protoize/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/c++/Makefile#3 (text+ko) ==== @@ -9,7 +9,7 @@ SRCS= gcc.c g++spec.c LINKS= ${BINDIR}/c++ ${BINDIR}/g++ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC -NO_MAN= +MK_MAN=no DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/c++filt/Makefile#3 (text+ko) ==== @@ -6,7 +6,7 @@ PROG= c++filt SRCS= cp-demangle.c -NO_MAN= +MK_MAN=no CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1/Makefile#3 (text+ko) ==== @@ -7,7 +7,7 @@ PROG= cc1 SRCS= main.c c-parse+%DIKED.c c-lang.c stub-objc.c BINDIR= /usr/libexec -NO_MAN= +MK_MAN=no NO_SHARED?=yes CFLAGS+= -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1obj/Makefile#3 (text+ko) ==== @@ -7,7 +7,7 @@ PROG= cc1obj SRCS= main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c BINDIR= /usr/libexec -NO_MAN= +MK_MAN=no NO_SHARED?=yes CFLAGS+= -I${GCCDIR}/objc -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1plus/Makefile#3 (text+ko) ==== @@ -12,7 +12,7 @@ search.c semantics.c tree.c typeck.c typeck2.c optimize.c BINDIR= /usr/libexec -NO_MAN= +MK_MAN=no NO_SHARED?=yes CFLAGS+= -I${GCCDIR}/cp -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/Makefile#3 (text+ko) ==== @@ -22,6 +22,10 @@ CFLAGS+= -DGENERATOR_FILE +.if ${MK_LIBC_THREADS} != "no" +CFLAGS+= -DFBSD_LIBC_THREADS +.endif + # #----------------------------------------------------------------------- # Build 'pocket' libiberty exclusively for build tools use. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/f771/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ stb.c stc.c std.c ste.c storag.c stp.c str.c sts.c stt.c stu.c stv.c \ stw.c symbol.c target.c top.c type.c where.c main.c BINDIR= /usr/libexec -NO_MAN= +MK_MAN=no CFLAGS+= -I${GCCDIR}/f -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/protoize/Makefile#3 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/../cc_tools ${GCCDIR} PROG= protoize -NO_MAN= +MK_MAN=no # things are rather hard-coded, we work around that here CFLAGS+= -DDEFAULT_TARGET_VERSION=\"\"