This is an archive of the discontinued LLVM Phabricator instance.

Differential D16284

Fix Makefile build
ClosedPublic

Authored by ihnorton on Jan 17 2016, 9:21 PM.

Details

Reviewers
clayborg
loladiro
Commits
rG27bf243da4e8: Fix Makefile build
Summary
  • 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.

Diff Detail

Event Timeline

ihnorton updated this revision to Diff 45146.Jan 17 2016, 9:21 PM
ihnorton retitled this revision from to Fix Makefile build.
ihnorton updated this object.
ihnorton added a reviewer: loladiro.
ihnorton added a subscriber: lldb-commits.
ihnorton updated this revision to Diff 45147.Jan 17 2016, 9:24 PM

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

loladiro accepted this revision.Jan 18 2016, 12:28 AM
loladiro edited edge metadata.
loladiro added subscribers: clayborg, hans.

LGTM.

The Makefile system will be removed from trunk very soon, so it might not necessarily make sense there, but I think it would be good to get this applied to release-38. @clayborg @hans how would you like to handle that? Apply this to trunk and backport?

This revision is now accepted and ready to land.Jan 18 2016, 12:28 AM
hans added a comment.Jan 19 2016, 9:20 AM
In D16284#329161, @loladiro wrote:

The Makefile system will be removed from trunk very soon, so it might not necessarily make sense there, but I think it would be good to get this applied to release-38. @clayborg @hans how would you like to handle that? Apply this to trunk and backport?

Yes, exactly.

clayborg accepted this revision.Jan 19 2016, 10:17 AM
clayborg added a reviewer: clayborg.
hans added a comment.Jan 26 2016, 11:07 AM

Did this ever get committed?

hans added a comment.Jan 28 2016, 11:15 AM

loladiro: Ping?

loladiro added a comment.Jan 28 2016, 11:16 AM

Sorry I've been away. No this didn't make it in before the Makefiles were removed from trunk. What would you prefer we do?

hans added a comment.Jan 28 2016, 11:36 AM

I've committed the patch to 3.8 in r259081.

Please confirm if this fixes the issue there.

Eugene.Zelenko closed this revision.Sep 21 2016, 3:54 PM
Eugene.Zelenko added a subscriber: Eugene.Zelenko.

Committed in r259081.

Revision Contents

PathSize
8 lines
source/
Plugins/
Platform/
MacOSX/
19 lines

Diff 45147

Makefile

Context not available.
ifeq ($(IS_TOP_LEVEL),1) 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:: test::
@ $(MAKE) -C test @ $(MAKE) -C test
Context not available.

source/Plugins/Platform/MacOSX/Makefile

Context not available.
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LLDB_LEVEL := ../../../.. 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 LIBRARYNAME := lldbPluginPlatformMacOSX
BUILD_ARCHIVE = 1 BUILD_ARCHIVE = 1
Context not available.