[PATCH] D17784: Check if LLVM_PREFIX is defined before using it.

[Chaoren Lin via cfe-commits]

chaoren created this revision.
chaoren added reviewers: kparzysz, bkramer.
chaoren added a subscriber: cfe-commits.

LLVM_PREFIX could be undefined if CMAKE_INSTALL_PREFIX were set to empty.

http://reviews.llvm.org/D17784

Files:
  lib/Driver/ToolChains.cpp

Index: lib/Driver/ToolChains.cpp
===================================================================
--- lib/Driver/ToolChains.cpp
+++ lib/Driver/ToolChains.cpp
@@ -2607,9 +2607,11 @@
   if (getVFS().exists(InstallRelDir = InstalledDir + "/../target"))
     return InstallRelDir;
 
+#ifdef LLVM_PREFIX
   std::string PrefixRelDir = std::string(LLVM_PREFIX) + "/target";
   if (getVFS().exists(PrefixRelDir))
     return PrefixRelDir;
+#endif
 
   return InstallRelDir;
 }



Index: lib/Driver/ToolChains.cpp
===================================================================
--- lib/Driver/ToolChains.cpp
+++ lib/Driver/ToolChains.cpp
@@ -2607,9 +2607,11 @@
   if (getVFS().exists(InstallRelDir = InstalledDir + "/../target"))
     return InstallRelDir;
 
+#ifdef LLVM_PREFIX
   std::string PrefixRelDir = std::string(LLVM_PREFIX) + "/target";
   if (getVFS().exists(PrefixRelDir))
     return PrefixRelDir;
+#endif
 
   return InstallRelDir;
 }

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits