Module Name: src
Committed By: plunky
Date: Sat Aug 20 22:16:56 UTC 2011
Modified Files:
src/lib: Makefile
Log Message:
only build libgmp, libmpfr and libmpc when (MKGCC != no) and
they can be together since only the .a is built, with no
other dependencies
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.173 src/lib/Makefile:1.174
--- src/lib/Makefile:1.173 Thu Jul 21 03:13:30 2011
+++ src/lib/Makefile Sat Aug 20 22:16:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2011/07/21 03:13:30 mrg Exp $
+# $NetBSD: Makefile,v 1.174 2011/08/20 22:16:56 plunky Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -76,12 +76,13 @@
. else
SUBDIR+= ../external/gpl3/gcc/lib/libobjc
. endif
-.endif
-
+. if ${HAVE_GCC} >= 45 && !defined(MLIBDIR)
# Should probably move GMP, MPFR and MPC builds into the GCC >= 4.5
# specific build area, but we get better parallelism this way.
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && !defined(MLIBDIR)
SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
+SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
+SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
+. endif
.endif
#
@@ -133,10 +134,6 @@
. endif
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && !defined(MLIBDIR)
-SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
-.endif
-
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
@@ -165,10 +162,6 @@
SUBDIR+= librumphijack
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && !defined(MLIBDIR)
-SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
-.endif
-
#==================== 3rd library dependency barrier ====================
SUBDIR+= .WAIT
