[Lldb-commits] [lldb] r248057 - On Linux, if you can't actually locate the libc++ install, do not attempt to use it

[Enrico Granata via lldb-commits]

Author: enrico
Date: Fri Sep 18 17:26:34 2015
New Revision: 248057

URL: http://llvm.org/viewvc/llvm-project?rev=248057&view=rev
Log:
On Linux, if you can't actually locate the libc++ install, do not attempt to use it

The failure mode when one gets this wrong is quite gnarly to then walk oneself out of, and if you can't actually find the library, trying to build against it is fairly pointless anyway
This + my previous skip_if_library_missing change should make running the libc++ tests on a Linux machine without it much more seamless


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

Modified: lldb/trunk/test/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=248057&r1=248056&r2=248057&view=diff
==============================================================================
--- lldb/trunk/test/make/Makefile.rules (original)
+++ lldb/trunk/test/make/Makefile.rules Fri Sep 18 17:26:34 2015
@@ -284,12 +284,17 @@ endif
 ifeq (1,$(USE_LIBCPP))
 	# Clang requires an extra flag: -stdlib=libstdc++
 	ifneq (,$(findstring clang,$(CC)))
-		CXXFLAGS += -stdlib=libc++
-		LDFLAGS += -stdlib=libc++
 		ifeq "$(OS)" "Linux"
 			# This is the default install location on Ubuntu 14.04
-			CXXFLAGS += -I/usr/include/c++/v1
-        	endif
+			ifneq ($(wildcard /usr/include/c++/v1/.),)
+				CXXFLAGS += -stdlib=libc++
+				LDFLAGS += -stdlib=libc++
+				CXXFLAGS += -I/usr/include/c++/v1
+			endif
+		else
+			CXXFLAGS += -stdlib=libc++
+			LDFLAGS += -stdlib=libc++
+		endif
 	endif
 endif