Module Name: src
Committed By: skrll
Date: Sun Oct 20 17:12:23 UTC 2013
Modified Files:
src/tools/gcc: Makefile
Log Message:
Group the mknative stuff together - no functional change
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.58 src/tools/gcc/Makefile:1.59
--- src/tools/gcc/Makefile:1.58 Sun Oct 20 17:10:15 2013
+++ src/tools/gcc/Makefile Sun Oct 20 17:12:23 2013
@@ -1,25 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2013/10/20 17:10:15 skrll Exp $
+# $NetBSD: Makefile,v 1.59 2013/10/20 17:12:23 skrll Exp $
.include <bsd.own.mk>
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
-MKNATIVE_CONFIG_TARGET_LIBS= \
- configure-target-libstdc++-v3 \
- configure-target-libobjc
-
-.if ${HAVE_GCC} == 45
-MKNATIVE_TARGET= gcc45
-GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
-MKNATIVE_CONFIG_TARGET_LIBS+= \
- configure-target-libgomp
-.else
-MKNATIVE_TARGET= gcc4
-.endif
-
-BINENV= /usr/bin/env -i
-
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
MULTILIB_ARGS= --enable-multilib
.else
@@ -69,6 +54,30 @@ MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKE
CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \
gcc_cv_as_sparc_gotdata_op=no
+ALL_TARGET= all-gcc
+INSTALL_TARGET= install-gcc
+
+.include "${.CURDIR}/../Makefile.gmakehost"
+BUILD_MAKE=${TOOL_GMAKE}
+
+#
+# mknative-gcc specific stuff
+#
+MKNATIVE_CONFIG_TARGET_LIBS= \
+ configure-target-libstdc++-v3 \
+ configure-target-libobjc
+
+.if ${HAVE_GCC} == 45
+MKNATIVE_TARGET= gcc45
+GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+ configure-target-libgomp
+.else
+MKNATIVE_TARGET= gcc4
+.endif
+
+BINENV= /usr/bin/env -i
+
MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
CC_FOR_BUILD=${HOST_CC:Q} \
CC=${CC:Q}' '${CCADDFLAGS:Q} \
@@ -90,16 +99,6 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
gdb_cv_scanf_has_long_double=yes \
gcc_cv_as_sparc_gotdata_op=no
-ALL_TARGET= all-gcc
-INSTALL_TARGET= install-gcc
-
-.include "${.CURDIR}/../Makefile.gmakehost"
-BUILD_MAKE=${TOOL_GMAKE}
-
-#
-# mknative-gcc specific stuff
-#
-
.if ${HAVE_GCC} < 45
GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
.else
