[Makefiles] Re-add OSX specific code that got lost in lldbHost consolidation
authorKeno Fischer <kfischer@college.harvard.edu>
Fri, 17 Jul 2015 21:47:35 +0000 (21:47 +0000)
committerKeno Fischer <kfischer@college.harvard.edu>
Fri, 17 Jul 2015 21:47:35 +0000 (21:47 +0000)
llvm-svn: 242577

lldb/source/Host/Makefile

index a8e4260..5b88ba6 100644 (file)
@@ -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)