From: Misha Brukman <brukman+llvm@gmail.com>
Date: Tue, 3 May 2005 06:10:51 +0000 (+0000)
Subject: std::string(NULL) does not a proper constructor make
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a98ff8d3abe670c716f4a3b8d87c3583c61f505;p=oota-llvm.git

std::string(NULL) does not a proper constructor make


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

diff --git a/tools/llvmc/llvmc.cpp b/tools/llvmc/llvmc.cpp
index d6409af3e0a..4f325e68e09 100644
--- a/tools/llvmc/llvmc.cpp
+++ b/tools/llvmc/llvmc.cpp
@@ -281,9 +281,9 @@ int main(int argc, char **argv) {
 
     // If the LLVM_LIB_SEARCH_PATH environment variable is
     // set, append it to the list of places to search for libraries
-    std::string srchPath = getenv("LLVM_LIB_SEARCH_PATH");
-    if (!srchPath.empty())
-      LibPaths.push_back(srchPath);
+    char *srchPath = getenv("LLVM_LIB_SEARCH_PATH");
+    if (srchPath != NULL && strlen(srchPath) != 0)
+      LibPaths.push_back(std::string(srchPath));
 
     // Set the driver flags based on command line options
     unsigned flags = 0;