Module Name:    src
Committed By:   christos
Date:           Mon Jun 23 18:37:45 UTC 2014

Modified Files:
        src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile

Log Message:
Allow always setting MKCOMPAT (and not failing in weird ways like
creating a c++config.h that only contains #endif), by selecting
only machine_archs that contain *64* in their name.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
    src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/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/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.15 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.16
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.15	Sun Jun  1 15:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile	Mon Jun 23 14:37:45 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2014/06/01 19:51:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2014/06/23 18:37:45 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -19,7 +19,7 @@ INCS+=		${BUILDINCS}
 INCS+=		nested_exception.h hash_bytes.h atomic_lockfree_defines.h
 INCS+=		cxxabi_forced.h	exception_defines.h exception_ptr.h
 
-.if ${MKCOMPAT} != no
+.if ${MKCOMPAT} != no && !empty(MACHINE_ARCH:M*64*)
 SUBDIR+=	arch
 .else
 INCS+=		c++config.h

Reply via email to