[Lldb-commits] [lldb] r242577 - [Makefiles] Re-add OSX specific code that got lost in lldbHost consolidation

[Keno Fischer]

Author: kfischer
Date: Fri Jul 17 16:47:35 2015
New Revision: 242577

URL: http://llvm.org/viewvc/llvm-project?rev=242577&view=rev
Log:
[Makefiles] Re-add OSX specific code that got lost in lldbHost consolidation

Modified:
    lldb/trunk/source/Host/Makefile

Modified: lldb/trunk/source/Host/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/Makefile?rev=242577&r1=242576&r2=242577&view=diff
==============================================================================
--- lldb/trunk/source/Host/Makefile (original)
+++ lldb/trunk/source/Host/Makefile Fri Jul 17 16:47:35 2015
@@ -14,7 +14,7 @@ include $(LEVEL)/Makefile.config
 
 define DIR_SOURCES
 SOURCES += $$(addprefix $(1)/,$$(notdir $$(wildcard $$(PROJ_SRC_DIR)/$(1)/*.cpp \
-					 $$(PROJ_SRC_DIR)/*.cc $$(PROJ_SRC_DIR)/$(1)/*.c)))
+					 $$(PROJ_SRC_DIR)/*.cc $$(PROJ_SRC_DIR)/$(1)/*.c $$(PROJ_SRC_DIR)/$(1)/*.mm)))
 endef
 
 $(eval $(call DIR_SOURCES,common))
@@ -22,6 +22,15 @@ $(eval $(call DIR_SOURCES,common))
 ifeq ($(HOST_OS),Darwin)
 $(eval $(call DIR_SOURCES,posix))
 $(eval $(call DIR_SOURCES,macosx))
+CFCPP_SOURCES = \
+          $(addprefix macosx/cfcpp/,$(notdir $(wildcard $(PROJ_SRC_DIR)/macosx/cfcpp/*.cpp)))
+SOURCES += $(CFCPP_SOURCES)
+
+CFCPP_BaseNameSources := $(sort $(basename $(CFCPP_SOURCES)))
+CFCPP_OBJECTS := $(CFCPP_BaseNameSources:%=$(ObjDir)/%.o)
+
+# Make sure the cfcpp output directory exists
+$(CFCPP_OBJECTS): $(ObjDir)/cfcpp/.dir
 endif
 
 ifeq ($(HOST_OS),Linux)