Module Name: src
Committed By: mrg
Date: Mon Feb 4 00:55:26 UTC 2019
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
- don't getlinks here, they're no longer used.
- pullout the libcommon, libcommon-target and libgomp source list so they
don't have to be hard coded in the reachover makefile
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/tools/gcc/mknative-gcc
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/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.97 src/tools/gcc/mknative-gcc:1.98
--- src/tools/gcc/mknative-gcc:1.97 Fri Feb 1 09:27:23 2019
+++ src/tools/gcc/mknative-gcc Mon Feb 4 00:55:26 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.98 2019/02/04 00:55:26 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -82,7 +82,6 @@ get_libgcc () {
SHLIB_MAPFILES SHLIB_NM_FLAGS
getvars gcc/Makefile \
NOEXCEPTION_FLAGS EXTRA_HEADERS
- getlinks config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
@@ -161,6 +160,11 @@ get_libgomp () {
_subdir="$1"
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
+
+ getvars $_PLATFORM/libgomp/Makefile \
+ libgomp_la_SOURCES \
+ | write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
+
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
<$_TMPDIR/$_PLATFORM/libgomp/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp_f.h \
@@ -198,7 +202,6 @@ get_libobjc () {
getvars $_PLATFORM/libobjc/Makefile \
ALL_CFLAGS INCLUDES OBJC_SOURCE_FILES C_SOURCE_FILES OBJC_H \
| sed "s,$_GNU_DIST,\${GNUHOSTDIST},g"
- getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
@@ -275,7 +278,6 @@ get_libstdcxx_v3 () {
$_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
- getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
}
@@ -350,6 +352,13 @@ get_gcc () {
EXTRA_HEADERS \
| write_mk $_OUTDIRBASE/usr.bin/include/arch/$MACHINE_ARCH.mk
+ getvars gcc/Makefile \
+ OBJS-libcommon \
+ | write_mk $_OUTDIRBASE/usr.bin/common/defs.mk
+ getvars gcc/Makefile \
+ OBJS-libcommon-target \
+ | write_mk $_OUTDIRBASE/usr.bin/common-target/defs.mk
+
write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
for f in $hfiles; do
