[Lldb-commits] [lldb] r131718 - in /lldb/trunk/source/Host/macosx: Host.mm Makefile

[Charles Davis]

Author: cdavis
Date: Thu May 19 23:04:17 2011
New Revision: 131718

URL: http://llvm.org/viewvc/llvm-project?rev=131718&view=rev
Log:
Fix the Host library build on Mac OS X with makefiles.

Modified:
    lldb/trunk/source/Host/macosx/Host.mm
    lldb/trunk/source/Host/macosx/Makefile

Modified: lldb/trunk/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=131718&r1=131717&r2=131718&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Thu May 19 23:04:17 2011
@@ -565,7 +565,7 @@
 
 extern "C" {
     const char *__crashreporter_info__ = NULL;
-};
+}
 
 asm(".desc ___crashreporter_info__, 0x10");
 

Modified: lldb/trunk/source/Host/macosx/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Makefile?rev=131718&r1=131717&r2=131718&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Makefile (original)
+++ lldb/trunk/source/Host/macosx/Makefile Thu May 19 23:04:17 2011
@@ -11,6 +11,14 @@
 LIBRARYNAME := lldbHostMacOSX
 BUILD_ARCHIVE = 1
 
-SOURCES := $(notdir $(wildcard *.cpp *.mm))
+SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
+          $(addprefix cfcpp/,$(notdir $(wildcard $(PROJ_SRC_DIR)/cfcpp/*.cpp)))
+
+# Make sure the cfcpp output directory exists
+all-local:: $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp
+
+$(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp:
+	-$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp 2>/dev/null
 
 include $(LLDB_LEVEL)/Makefile
+