Module Name:    src
Committed By:   joerg
Date:           Mon Oct 14 01:47:50 UTC 2013

Modified Files:
        src/external/bsd/llvm/config/llvm/Config: config.h.in
        src/external/bsd/llvm/include: Makefile

Log Message:
Don't pass -std=c++11 down to configure, it breaks C compiler detection.
Regen configuration.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/config/llvm/Config/config.h.in
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/include/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/bsd/llvm/config/llvm/Config/config.h.in
diff -u src/external/bsd/llvm/config/llvm/Config/config.h.in:1.8 src/external/bsd/llvm/config/llvm/Config/config.h.in:1.9
--- src/external/bsd/llvm/config/llvm/Config/config.h.in:1.8	Mon Sep  2 14:34:55 2013
+++ src/external/bsd/llvm/config/llvm/Config/config.h.in	Mon Oct 14 01:47:50 2013
@@ -22,6 +22,9 @@
 /* Define if you want backtraces on crash */
 #define ENABLE_BACKTRACES 1
 
+/* Define to enable crash handling overrides */
+#define ENABLE_CRASH_OVERRIDES 1
+
 /* Define if position independent code is enabled */
 #define ENABLE_PIC 1
 
@@ -71,7 +74,7 @@
 #define HAVE_CRASHREPORTER_INFO 0
 
 /* Define to 1 if you have the <cxxabi.h> header file. */
-/* #undef HAVE_CXXABI_H */
+#define HAVE_CXXABI_H 1
 
 /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you
    don't. */
@@ -217,6 +220,9 @@
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #define HAVE_LIBPTHREAD 1
 
+/* Define to 1 if you have the `shell32' library (-lshell32). */
+/* #undef HAVE_LIBSHELL32 */
+
 /* Define to 1 if you have the `udis86' library (-ludis86). */
 /* #undef HAVE_LIBUDIS86 */
 

Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.22 src/external/bsd/llvm/include/Makefile:1.23
--- src/external/bsd/llvm/include/Makefile:1.22	Mon Oct 14 01:37:39 2013
+++ src/external/bsd/llvm/include/Makefile	Mon Oct 14 01:47:50 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2013/10/14 01:37:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.23 2013/10/14 01:47:50 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -177,7 +177,7 @@ run-configure:
 	mkdir -p tmp
 	cd tmp && ${LLVM_SRCDIR}/configure ${LLVM_CONFIGURE_ARGS} \
 	    CC=${CC:Q} CFLAGS=${CFLAGS:N-Werror:Q} CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:N-Werror:Q} \
-	    CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} LIBS=-lm \
+	    CPPFLAGS=${CPPFLAGS:N-std=c++11:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} LIBS=-lm \
 	    ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_file=yes llvm_cv_c_printf_a=yes
 	cp -r tmp/include/llvm/* ${LLVM_INCLUDE_CONFIG}/llvm/
 	mv ${LLVM_INCLUDE_CONFIG}/llvm/Config/config.h \

Reply via email to