[llvm-branch-commits] [lldb] r259081 - Fix Makefile build

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 28 13:32:20 2016
New Revision: 259081

URL: http://llvm.org/viewvc/llvm-project?rev=259081&view=rev
Log:
Fix Makefile build

- `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.

Differential Revision: http://reviews.llvm.org/D16284

Patch by Isaiah!

(Committing directly to 3.8 since the Makefiles
were recently removed from trunk.)


Modified:
    lldb/branches/release_38/Makefile
    lldb/branches/release_38/source/Plugins/Platform/MacOSX/Makefile

Modified: lldb/branches/release_38/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/Makefile?rev=259081&r1=259080&r2=259081&view=diff
==============================================================================
--- lldb/branches/release_38/Makefile (original)
+++ lldb/branches/release_38/Makefile Thu Jan 28 13:32:20 2016
@@ -88,14 +88,6 @@ EXTRA_OPTIONS += -Wno-sign-compare
 
 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
 

Modified: lldb/branches/release_38/source/Plugins/Platform/MacOSX/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Plugins/Platform/MacOSX/Makefile?rev=259081&r1=259080&r2=259081&view=diff
==============================================================================
--- lldb/branches/release_38/source/Plugins/Platform/MacOSX/Makefile (original)
+++ lldb/branches/release_38/source/Plugins/Platform/MacOSX/Makefile Thu Jan 28 13:32:20 2016
@@ -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