Module Name: src
Committed By: mrg
Date: Tue Jul 5 08:36:17 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
fix the ordering of gmp, mpfr and mpc libraries. add to DPLIB.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.2 Tue Jun 28 10:15:40 2011
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Tue Jul 5 08:36:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/28 10:15:40 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 08:36:17 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -13,6 +13,7 @@
COPTS+= -Wno-stack-protector
-LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+LDADD+= -lmpc -lmpfr -lgmp -lintl -lz
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
.PATH: ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.2 Wed Jun 29 01:57:59 2011
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Tue Jul 5 08:36:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 08:36:17 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -16,6 +16,7 @@
COPTS+= -Wno-stack-protector
-LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+LDADD+= -lmpc -lmpfr -lgmp -lintl -lz
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
.PATH: ${DIST}/gcc/objc ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.2 Wed Jun 29 01:57:59 2011
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Tue Jul 5 08:36:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/05 08:36:17 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -16,6 +16,7 @@
# YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN
CFLAGS+= -Wno-error # not good enough: -Wno-return-type
-LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+LDADD+= -lmpc -lmpfr -lgmp -lintl -lz
+DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ}
.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${G_out_file:H}
