llvm-config: Add --has-rtti option

[oota-llvm.git] / tools / llvm-config / llvm-config.cpp

diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
index c007d71baf1d0129d1cd26dfabcefcf5d1b5ccc1..8bf2680d3918b32ef457396d19853041c6eda7fd 100644 (file)
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
@@ -157,6 +157,8 @@ Options:\n\
   --host-target     Target triple used to configure LLVM.\n\
   --build-mode      Print build mode of LLVM tree (e.g. Debug or Release).\n\
   --assertion-mode  Print assertion mode of LLVM tree (ON or OFF).\n\
+  --build-system    Print the build system used to build LLVM (autoconf or cmake).\n\
+  --has-rtti        Print whether or not LLVM was built with rtti (YES or NO).\n\
 Typical components:\n\
   all               All LLVM libraries (default).\n\
   engine            Either a native JIT or a bitcode interpreter.\n";
@@ -323,6 +325,10 @@ int main(int argc, char **argv) {
 #else
         OS << "ON\n";
 #endif
+      } else if (Arg == "--build-system") {
+        OS << LLVM_BUILD_SYSTEM << '\n';
+      } else if (Arg == "--has-rtti") {
+        OS << LLVM_HAS_RTTI << '\n';
       } else if (Arg == "--obj-root") {
         OS << ActivePrefix << '\n';
       } else if (Arg == "--src-root") {
@@ -349,30 +355,6 @@ int main(int argc, char **argv) {
                              /*IncludeNonInstalled=*/IsInDevelopmentTree);
 
     if (PrintLibs || PrintLibNames || PrintLibFiles) {
-      // If LLVM was built as a shared library, there will be only one thing
-      // that users should link against.
-      const bool IsSharedLib = (std::strcmp(BUILD_SHARED_LIBS, "ON") == 0);
-      const bool WasBuiltWithCMake = (std::strcmp(WAS_BUILT_WITH_CMAKE, "ON") == 0);
-      // CMake correctly builds components as separate shared libraries, however
-      // autoconfig/make builds components a static libraries and then links
-      // them all together to form a single shared library. Thus, only when
-      // `WAS_BUILT_WITH_CMAKE` is `OFF` and `BUILD_SHARED_LIBS` is `ON` do we
-      // override `RequiredLibs` with the single library name.
-      if (IsSharedLib && !WasBuiltWithCMake) {
-        RequiredLibs.clear();
-        std::string Name = "libLLVM-" PACKAGE_VERSION;
-        const Triple HostTriple(LLVM_DEFAULT_TARGET_TRIPLE);
-        if (HostTriple.isOSWindows()) {
-          Name += ".dll";
-        } else if (HostTriple.isOSDarwin()) {
-          Name += ".dylib";
-        } else {
-          // default to linux' ext:
-          Name += ".so";
-        }
-        RequiredLibs.push_back(Name);
-      }
-
       for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) {
         StringRef Lib = RequiredLibs[i];
         if (i)
@@ -384,23 +366,8 @@ int main(int argc, char **argv) {
           OS << ActiveLibDir << '/' << Lib;
         } else if (PrintLibs) {
           // If this is a typical library name, include it using -l.
-          if (Lib.startswith("lib")) {
-            size_t FromEnd = 0;
-            if (Lib.endswith(".a")) {
-              FromEnd = 2;
-            } else if (Lib.endswith(".so")) {
-              FromEnd = 3;
-            } else if (Lib.endswith(".dylib")) {
-              FromEnd = 6;
-            } else {
-              FromEnd = 0;
-            }
-
-            if (FromEnd != 0) {
-              OS << "-l" << Lib.slice(3, Lib.size() - FromEnd);
-            } else {
-              OS << "-l:" << Lib;
-            }
+          if (Lib.startswith("lib") && Lib.endswith(".a")) {
+            OS << "-l" << Lib.slice(3, Lib.size()-2);
             continue;
           }