summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Davis <cdavis@mines.edu>2011-05-20 18:18:09 +0000
committerCharles Davis <cdavis@mines.edu>2011-05-20 18:18:09 +0000
commit0b965227580dc2420376e4ceef2f596a0953b30e (patch)
treea201a026eec62750744dc61d062b542cfbca45e9
parentdae31daf6401bf17e19f2a65eef062baf9ce6a3c (diff)
downloadbcm5719-llvm-0b965227580dc2420376e4ceef2f596a0953b30e.tar.gz
bcm5719-llvm-0b965227580dc2420376e4ceef2f596a0953b30e.zip
Better way to build the CFCPP sources as part of liblldbHostMacOSX.
llvm-svn: 131742
-rw-r--r--lldb/source/Host/macosx/Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/lldb/source/Host/macosx/Makefile b/lldb/source/Host/macosx/Makefile
index eebbbee05aa..640d944a0e7 100644
--- a/lldb/source/Host/macosx/Makefile
+++ b/lldb/source/Host/macosx/Makefile
@@ -11,14 +11,16 @@ LLDB_LEVEL := ../../..
LIBRARYNAME := lldbHostMacOSX
BUILD_ARCHIVE = 1
-SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
+CFCPP_SOURCES = \
$(addprefix cfcpp/,$(notdir $(wildcard $(PROJ_SRC_DIR)/cfcpp/*.cpp)))
+SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.mm)) \
+ $(CFCPP_SOURCES)
-# Make sure the cfcpp output directory exists
-all-local:: $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp
+include $(LLDB_LEVEL)/Makefile
-$(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp:
- -$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/$(BuildMode)/cfcpp 2>/dev/null
+CFCPP_BaseNameSources := $(sort $(basename $(CFCPP_SOURCES)))
+CFCPP_OBJECTS := $(CFCPP_BaseNameSources:%=$(ObjDir)/%.o)
-include $(LLDB_LEVEL)/Makefile
+# Make sure the cfcpp output directory exists
+$(CFCPP_OBJECTS): $(ObjDir)/cfcpp/.dir
OpenPOWER on IntegriCloud