[Lldb-commits] [PATCH] D16284: Fix Makefile build

[Isaiah via lldb-commits]

ihnorton created this revision.
ihnorton added a reviewer: loladiro.
ihnorton added a subscriber: lldb-commits.

- `source/Plugins/Platform/MacOSX/PlatformiOSSimulatorCoreSimulatorSupport.mm` 
was not matched by the default target, causing link errors. Update Makefile to 
match r252205.
- `test/Makefile` no longer exists for LLDB, since r251532.

http://reviews.llvm.org/D16284

Files:
  Makefile
  source/Plugins/Platform/MacOSX/Makefile

Index: source/Plugins/Platform/MacOSX/Makefile
===
--- source/Plugins/Platform/MacOSX/Makefile
+++ source/Plugins/Platform/MacOSX/Makefile
@@ -8,6 +8,12 @@
 
##===--===##

 LLDB_LEVEL := ../../../..
+LEVEL := $(LLDB_LEVEL)/../..
+
+include $(LEVEL)/Makefile.config
+
+SOURCES += $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.cc 
$(PROJ_SRC_DIR)/*.c $(PROJ_SRC_DIR)/*.mm)
+
 LIBRARYNAME := lldbPluginPlatformMacOSX
 BUILD_ARCHIVE = 1

Index: Makefile
===
--- Makefile
+++ Makefile
@@ -88,14 +88,6 @@

 ifeq ($(IS_TOP_LEVEL),1)

-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-$(RecursiveTargets)::
-   $(Verb) if [ ! -f test/Makefile ]; then \
- $(MKDIR) test; \
- $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
-   fi
-endif
-
 test::
@ $(MAKE) -C test



Index: source/Plugins/Platform/MacOSX/Makefile
===
--- source/Plugins/Platform/MacOSX/Makefile
+++ source/Plugins/Platform/MacOSX/Makefile
@@ -8,6 +8,12 @@
 ##===--===##

 LLDB_LEVEL := ../../../..
+LEVEL := $(LLDB_LEVEL)/../..
+
+include $(LEVEL)/Makefile.config
+
+SOURCES += $(wildcard $(PROJ_SRC_DIR)/*.cpp $(PROJ_SRC_DIR)/*.cc $(PROJ_SRC_DIR)/*.c $(PROJ_SRC_DIR)/*.mm)
+
 LIBRARYNAME := lldbPluginPlatformMacOSX
 BUILD_ARCHIVE = 1

Index: Makefile
===
--- Makefile
+++ Makefile
@@ -88,14 +88,6 @@

 ifeq ($(IS_TOP_LEVEL),1)

-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-$(RecursiveTargets)::
-   $(Verb) if [ ! -f test/Makefile ]; then \
- $(MKDIR) test; \
- $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
-   fi
-endif
-
 test::
@ $(MAKE) -C test

___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Re: [Lldb-commits] [PATCH] D16284: Fix Makefile build

[Isaiah via lldb-commits]

ihnorton updated this revision to Diff 45147.
ihnorton added a comment.

Only build Apple-specific simulators on Darwin, as in r252205


http://reviews.llvm.org/D16284

Files:
  Makefile
  source/Plugins/Platform/MacOSX/Makefile

Index: source/Plugins/Platform/MacOSX/Makefile
===
--- source/Plugins/Platform/MacOSX/Makefile
+++ source/Plugins/Platform/MacOSX/Makefile
@@ -8,6 +8,25 @@
 
##===--===##
 
 LLDB_LEVEL := ../../../..
+LEVEL := $(LLDB_LEVEL)/../..
+
+include $(LEVEL)/Makefile.config
+
+SOURCES += PlatformDarwin.cpp \
+  PlatformDarwinKernel.cpp \
+  PlatformMacOSX.cpp \
+  PlatformRemoteiOS.cpp \
+  PlatformRemoteAppleTV.cpp \
+  PlatformRemoteAppleWatch.cpp
+
+ifeq ($(HOST_OS),Darwin)
+SOURCES += PlatformAppleSimulator.cpp \
+  PlatformiOSSimulator.cpp \
+  PlatformiOSSimulatorCoreSimulatorSupport.mm \
+  PlatformAppleTVSimulator.cpp \
+  PlatformAppleWatchSimulator.cpp
+endif
+
 LIBRARYNAME := lldbPluginPlatformMacOSX
 BUILD_ARCHIVE = 1
 
Index: Makefile
===
--- Makefile
+++ Makefile
@@ -88,14 +88,6 @@
 
 ifeq ($(IS_TOP_LEVEL),1)
 
-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-$(RecursiveTargets)::
-   $(Verb) if [ ! -f test/Makefile ]; then \
- $(MKDIR) test; \
- $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
-   fi
-endif
-
 test::
@ $(MAKE) -C test
 


Index: source/Plugins/Platform/MacOSX/Makefile
===
--- source/Plugins/Platform/MacOSX/Makefile
+++ source/Plugins/Platform/MacOSX/Makefile
@@ -8,6 +8,25 @@
 ##===--===##
 
 LLDB_LEVEL := ../../../..
+LEVEL := $(LLDB_LEVEL)/../..
+
+include $(LEVEL)/Makefile.config
+
+SOURCES += PlatformDarwin.cpp \
+		   PlatformDarwinKernel.cpp \
+		   PlatformMacOSX.cpp \
+		   PlatformRemoteiOS.cpp \
+		   PlatformRemoteAppleTV.cpp \
+		   PlatformRemoteAppleWatch.cpp
+
+ifeq ($(HOST_OS),Darwin)
+SOURCES += PlatformAppleSimulator.cpp \
+		   PlatformiOSSimulator.cpp \
+		   PlatformiOSSimulatorCoreSimulatorSupport.mm \
+		   PlatformAppleTVSimulator.cpp \
+		   PlatformAppleWatchSimulator.cpp
+endif
+
 LIBRARYNAME := lldbPluginPlatformMacOSX
 BUILD_ARCHIVE = 1
 
Index: Makefile
===
--- Makefile
+++ Makefile
@@ -88,14 +88,6 @@
 
 ifeq ($(IS_TOP_LEVEL),1)
 
-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-$(RecursiveTargets)::
-	$(Verb) if [ ! -f test/Makefile ]; then \
-	  $(MKDIR) test; \
-	  $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
-	fi
-endif
-
 test::
 	@ $(MAKE) -C test
 
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits