Avoid multiple definition warnings when both config.h and

llvm-config.h are included.

This is the cmake counterpart of r110547. See bug #7809.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110753 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index d9f95a6bfaa7dcb2f641fa56517d41fc5446a414..81e6ab5748635ceb5330bb47d57ce33f766e6f63 100644 (file)
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -3,6 +3,9 @@
 ** Created by Kevin from config.h.in **
 ***************************************/
 
+#ifndef CONFIG_H
+#define CONFIG_H
+
 /* Define if dlopen(0) will open the symbols of the program */
 #undef CAN_DLOPEN_SELF
 
@@ -628,3 +631,5 @@
 
 /* Native LLVM architecture, short name */
 #cmakedefine LLVM_NATIVE_ARCHNAME ${LLVM_NATIVE_ARCH}
+
+#endif

diff --git a/include/llvm/Config/llvm-config.h.cmake b/include/llvm/Config/llvm-config.h.cmake
index c277ef2b2077983f984d6162cfe5441f672e8108..b68592a64a0af67da679c262801cbc9749100662 100644 (file)
--- a/include/llvm/Config/llvm-config.h.cmake
+++ b/include/llvm/Config/llvm-config.h.cmake
@@ -11,6 +11,11 @@
    they can be in exported headers and won't override package specific
    directives.  This is a C file so we can include it in the llvm-c headers.  */
 
+/* To avoid multiple inclusions of these variables when we include the exported
+   headers and config.h, conditionally include these.  */
+/* TODO: This is a bit of a hack.  */
+#ifndef CONFIG_H
+
 /* Installation directory for binary executables */
 #cmakedefine LLVM_BINDIR "${LLVM_BINDIR}"
 
@@ -82,3 +87,5 @@
 
 /* Installation prefix directory */
 #cmakedefine LLVM_PREFIX "${LLVM_PREFIX}"
+
+#endif