diff options
| author | Alp Toker <alp@nuanti.com> | 2014-01-23 11:26:37 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-01-23 11:26:37 +0000 |
| commit | 1f0d177335eeaf26b4b3e006b7866141e9951254 (patch) | |
| tree | f3581dce158f0656c64bbd3b7b79de68f378c5e1 /tools/lli | |
| parent | aaf44af76926c2728c0029bed31364cbb743d033 (diff) | |
| download | llvm-1f0d177335eeaf26b4b3e006b7866141e9951254.tar.gz llvm-1f0d177335eeaf26b4b3e006b7866141e9951254.tar.bz2 llvm-1f0d177335eeaf26b4b3e006b7866141e9951254.tar.xz | |
Interim build fix for Makefiles
Looks like some parts still need detangling. Let's see if this holds for now.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199885 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/lli')
| -rw-r--r-- | tools/lli/ChildTarget/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/lli/ChildTarget/Makefile | 6 | ||||
| -rw-r--r-- | tools/lli/RemoteTarget.cpp | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/tools/lli/ChildTarget/CMakeLists.txt b/tools/lli/ChildTarget/CMakeLists.txt index 6191fd6016..50f114d956 100644 --- a/tools/lli/ChildTarget/CMakeLists.txt +++ b/tools/lli/ChildTarget/CMakeLists.txt @@ -1,4 +1,5 @@ set(LLVM_LINK_COMPONENTS support) +add_definitions(-DLLI_BUILDING_CHILD) add_llvm_executable(lli-child-target ChildTarget.cpp diff --git a/tools/lli/ChildTarget/Makefile b/tools/lli/ChildTarget/Makefile index eff49c9f1c..35a354156c 100644 --- a/tools/lli/ChildTarget/Makefile +++ b/tools/lli/ChildTarget/Makefile @@ -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 diff --git a/tools/lli/RemoteTarget.cpp b/tools/lli/RemoteTarget.cpp index f07534d161..c3195e2154 100644 --- a/tools/lli/RemoteTarget.cpp +++ b/tools/lli/RemoteTarget.cpp @@ -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::hostSupportsExternalRemoteTarget() { #endif } +#endif //////////////////////////////////////////////////////////////////////////////// // Simulated remote execution |