[Lldb-commits] [lldb] r225604 - Got C++ unit tests running on Linux again

[Vince Harron]

Author: vharron
Date: Sun Jan 11 03:42:12 2015
New Revision: 225604

URL: http://llvm.org/viewvc/llvm-project?rev=225604&view=rev
Log:
Got C++ unit tests running on Linux again


Modified:
    lldb/trunk/gtest/make/Makefile.rules

Modified: lldb/trunk/gtest/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/gtest/make/Makefile.rules?rev=225604&r1=225603&r2=225604&view=diff
==============================================================================
--- lldb/trunk/gtest/make/Makefile.rules (original)
+++ lldb/trunk/gtest/make/Makefile.rules Sun Jan 11 03:42:12 2015
@@ -9,8 +9,13 @@ ifneq ($(wildcard $(THIS_FILE_DIR)../../
     # Assume lldb/llvm (MacOSX Xcode) directory form.
     LLVM_BASE_DIR := $(realpath $(THIS_FILE_DIR)../../llvm)
 else
-    # Assume llvm/tools/lldb (Non-MacOSX) directory form.
-    LLVM_BASE_DIR := $(realpath $(THIS_FILE_DIR)../../../..)
+    ifneq ($(wildcard $(THIS_FILE_DIR)../../../llvm/utils/unittest/googletest),)
+        # Assume lldb/llvm side-by-side configuration (with symbolic links)
+        LLVM_BASE_DIR := $(realpath $(THIS_FILE_DIR)../../../llvm)
+    else
+        # Assume llvm/tools/lldb (Non-MacOSX) directory form.
+        LLVM_BASE_DIR := $(realpath $(THIS_FILE_DIR)../../../..)
+    endif
 endif
 
 ifeq ($(GTEST_DIR),)
@@ -88,4 +93,4 @@ include $(realpath $(THIS_FILE_DIR)../..
 test:: $(EXE)
 	$(realpath $(EXE))
 
-endif
\ No newline at end of file
+endif