Module Name:src
Committed By: mrg
Date: Thu Feb 7 05:28:12 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/gcc/arch/vax: defs.mk
Log Message:
fix merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk
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/gcc/arch/vax/defs.mk
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk:1.15 src/external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk:1.16
--- src/external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk:1.15 Mon Feb 4 02:58:47 2019
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/defs.mk Thu Feb 7 05:28:12 2019
@@ -2,833 +2,6 @@
# Generated from: NetBSD: mknative-gcc,v 1.99 2019/02/04 01:46:59 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp
#
-running CONFIG_SHELL=/bin/sh /bin/sh /usr/src6/external/gpl3/gcc/dist/gcc/configure --srcdir=/usr/src6/tools/gcc/../../external/gpl3/gcc/dist/gcc --cache-file=./config.cache --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion=NetBSD nb1 20190119 --with-system-zlib --without-isl --disable-libstdcxx-dual-abi --enable-__cxa_atexit --enable-libstdcxx-time=rt --enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --with-default-libstdcxx-abi=new --with-mpc-lib=/var/obj/mknative/vax/usr/src6/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/vax/usr/src6/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/vax/usr/src6/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src6/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src6/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src6/external/lgpl3/gmp/lib/libgmp/arch/vax --disable-multilib --disable-symvers --disable-libstdcxx-pch --with-sysr
oot=/var/obj/mknative/vax/usr/src6/destdir.vax --enable-languages=c,c++,lto,objc --program-transform-name=s,y,y, --disable-option-checking --build=x86_64-unknown-netbsd8.0 --host=vax--netbsdelf --target=vax--netbsdelf build_alias=x86_64-unknown-netbsd8.0 host_alias=vax--netbsdelf target_alias=vax--netbsdelf CC=/var/obj/mknative/vax/usr/src6/tooldir.NetBSD-8.0_STABLE-amd64/bin/vax--netbsdelf-gcc --sysroot=/var/obj/mknative/vax/usr/src6/destdir.vax -L/var/obj/mknative/vax/usr/src6/destdir.vax/lib -L/var/obj/mknative/vax/usr/src6/destdir.vax/usr/lib -B/var/obj/mknative/vax/usr/src6/destdir.vax/usr/lib/ -I/var/obj/mknative/vax/usr/src6/tools/gcc/.native/gcc/include CFLAGS= LDFLAGS=-static-libstdc++ -static-libgcc CPPFLAGS= CXX=/var/obj/mknative/vax/usr/src6/tooldir.NetBSD-8.0_STABLE-amd64/bin/vax--netbsdelf-c++ --sysroot=/var/obj/mknative/vax/usr/src6/destdir.vax -L/var/obj/mknative/vax/usr/src6/destdir.vax/lib -L/var/obj/mknative/vax/usr/src6/destdir.vax/usr/lib -B/var/obj/mknative/va
x/usr/src6/destdir.vax/usr/lib/ -I/var/obj/mknative/vax/usr/src6/tools/gcc/.native/gcc/include --sysroot=/var/obj/mknative/vax/usr/src6/destdir.vax CXXFLAGS= CPP=/var/obj/mknative/vax/usr/src6/tooldir.NetBSD-8.0_STABLE-amd64/bin/vax--netbsdelf-cpp -I/var/obj/mknative/vax/usr/src6/destdir.vax/usr/include -I/var/obj/mknative/vax/usr/src6/destdir.vax/usr/include/g++/bits GMPLIBS=-L/var/obj/mknative/vax/usr/src6/external/lgpl3/gmp/lib/libgmp -L/var/obj/mknative/vax/usr/src6/external/lgpl3/mpfr/lib/libmpfr -L/var/obj/mknative/vax/usr/src6/external/lgpl3/mpc/lib/libmpc -lmpc -lmpfr -lgmp GMPINC=-I/usr/src6/external/lgpl3/gmp/lib/libgmp/arch/vax -I/usr/src6/external/lgpl3/mpfr/dist/src -I/usr/src6/external/lgpl3/mpc/dist/src ISLLIBS= ISLINC= --no-create --no-recursion
-configure: loading cache ./config.cache
-checking build system type... (cached) x86_64-unknown-netbsd8.0
-checking host system type... (cached) vax--netbsdelf
-checking target system type... (cached) vax--netbsdelf
-checking LIBRARY_PATH variable... ok
-checking GCC_EXEC_PREFIX variable... ok
-checking whether to place generated files in the source directory... no
-checking whether a default linker was specified... no
-checking whether a default assembler was specified... no
-checking for vax--netbsdelf-gcc... (cached) /var/obj/mknative/vax/usr/src6/tooldir.NetBSD-8.0_STABLE-amd64/bin/vax--netbsdelf-gcc --sysroot=/var/obj/mknative/vax/usr/src6/destdir.vax -L/var/obj/mknative/vax/usr/src6/destdir.vax/lib -L/var/obj/mknative/vax/usr/src6/destdir.vax/usr/lib -B/var/obj/mknative/vax/usr/src6/destdir.vax/usr/lib/ -I/var/obj/mknative/vax/usr/src6/tools/gcc/.native/gcc/include
-checking for C compiler default output file name... a.out
-checking whether the C compiler works... yes
-checking whether we are cross compiling... yes
-checking for suffix of executables...
-checking for suffix of object files... (cached) o
-checking whether we are using the GNU C compiler... (cached) yes
-checking whether
