[llvm] r199885 - Interim build fix for Makefiles

[Alp Toker]

Author: alp
Date: Thu Jan 23 05:26:37 2014
New Revision: 199885

URL: http://llvm.org/viewvc/llvm-project?rev=199885&view=rev
Log:
Interim build fix for Makefiles

Looks like some parts still need detangling. Let's see if this holds for now.

Modified:
    llvm/trunk/tools/lli/ChildTarget/CMakeLists.txt
    llvm/trunk/tools/lli/ChildTarget/Makefile
    llvm/trunk/tools/lli/RemoteTarget.cpp

Modified: llvm/trunk/tools/lli/ChildTarget/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/ChildTarget/CMakeLists.txt?rev=199885&r1=199884&r2=199885&view=diff
==============================================================================
--- llvm/trunk/tools/lli/ChildTarget/CMakeLists.txt (original)
+++ llvm/trunk/tools/lli/ChildTarget/CMakeLists.txt Thu Jan 23 05:26:37 2014
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS support)
+add_definitions(-DLLI_BUILDING_CHILD)
 
 add_llvm_executable(lli-child-target
   ChildTarget.cpp

Modified: llvm/trunk/tools/lli/ChildTarget/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/ChildTarget/Makefile?rev=199885&r1=199884&r2=199885&view=diff
==============================================================================
--- llvm/trunk/tools/lli/ChildTarget/Makefile (original)
+++ llvm/trunk/tools/lli/ChildTarget/Makefile Thu Jan 23 05:26:37 2014
@@ -12,8 +12,10 @@ TOOLNAME := lli-child-target
 
 include $(LEVEL)/Makefile.config
 
-LINK_COMPONENTS :=
+LINK_COMPONENTS := support
 
-SOURCES += ../RemoteTarget.cpp
+CXXFLAGS += -DLLI_BUILDING_CHILD
+
+SOURCES := ChildTarget.cpp ../RemoteTarget.cpp
 
 include $(LLVM_SRC_ROOT)/Makefile.rules

Modified: llvm/trunk/tools/lli/RemoteTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/RemoteTarget.cpp?rev=199885&r1=199884&r2=199885&view=diff
==============================================================================
--- llvm/trunk/tools/lli/RemoteTarget.cpp (original)
+++ llvm/trunk/tools/lli/RemoteTarget.cpp Thu Jan 23 05:26:37 2014
@@ -22,6 +22,8 @@
 
 using namespace llvm;
 
+#ifndef LLI_BUILDING_CHILD
+
 // Static methods
 RemoteTarget *RemoteTarget::createRemoteTarget() {
   return new RemoteTarget;
@@ -43,6 +45,7 @@ bool RemoteTarget::hostSupportsExternalR
 #endif
 }
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Simulated remote execution