diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2008-10-03 10:26:37 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2008-10-03 10:26:37 +0000 |
| commit | dcbcd5ca5c2426c8669fd604b48c319dca51d22a (patch) | |
| tree | e4bc7a338a3dc9916500a8b8c0ee5b7f837096e1 | |
| parent | 20e4de7b3d973dc31e2b68272502df1911b5d595 (diff) | |
| download | external_llvm-dcbcd5ca5c2426c8669fd604b48c319dca51d22a.zip external_llvm-dcbcd5ca5c2426c8669fd604b48c319dca51d22a.tar.gz external_llvm-dcbcd5ca5c2426c8669fd604b48c319dca51d22a.tar.bz2 | |
Fix build breakage when objdir!=srcdir (proper fix).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56999 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | tools/llvmc2/Makefile | 3 | ||||
| -rw-r--r-- | tools/llvmc2/plugins/Base/Makefile | 2 | ||||
| -rw-r--r-- | tools/llvmc2/plugins/Clang/Makefile | 2 | ||||
| -rw-r--r-- | tools/llvmc2/plugins/Hello/Makefile | 2 | ||||
| -rw-r--r-- | tools/llvmc2/plugins/Makefile (renamed from tools/llvmc2/plugins/Makefile.plugins) | 21 |
5 files changed, 20 insertions, 10 deletions
diff --git a/tools/llvmc2/Makefile b/tools/llvmc2/Makefile index 63f933d..3f35de0 100644 --- a/tools/llvmc2/Makefile +++ b/tools/llvmc2/Makefile @@ -11,10 +11,9 @@ LEVEL = ../.. BUILTIN_PLUGINS = Base DRIVER_NAME = llvmc2 -DIRS = $(patsubst %,plugins/%,$(BUILTIN_PLUGINS)) src +DIRS = plugins src export BUILTIN_PLUGINS export DRIVER_NAME -export BUILTIN_LLVMC_PLUGIN=1 include $(LEVEL)/Makefile.common diff --git a/tools/llvmc2/plugins/Base/Makefile b/tools/llvmc2/plugins/Base/Makefile index d8f7610..89cdaf4a 100644 --- a/tools/llvmc2/plugins/Base/Makefile +++ b/tools/llvmc2/plugins/Base/Makefile @@ -9,4 +9,4 @@ LLVMC_PLUGIN = Base -include ../Makefile.plugins +include ../Makefile diff --git a/tools/llvmc2/plugins/Clang/Makefile b/tools/llvmc2/plugins/Clang/Makefile index da1043e..e48824a 100644 --- a/tools/llvmc2/plugins/Clang/Makefile +++ b/tools/llvmc2/plugins/Clang/Makefile @@ -9,5 +9,5 @@ LLVMC_PLUGIN = Clang -include ../Makefile.plugins +include ../Makefile diff --git a/tools/llvmc2/plugins/Hello/Makefile b/tools/llvmc2/plugins/Hello/Makefile index 0fcaaa7..f0d51dd 100644 --- a/tools/llvmc2/plugins/Hello/Makefile +++ b/tools/llvmc2/plugins/Hello/Makefile @@ -9,4 +9,4 @@ LLVMC_PLUGIN = Hello -include ../Makefile.plugins +include ../Makefile diff --git a/tools/llvmc2/plugins/Makefile.plugins b/tools/llvmc2/plugins/Makefile index 51e297d..568752e 100644 --- a/tools/llvmc2/plugins/Makefile.plugins +++ b/tools/llvmc2/plugins/Makefile @@ -7,11 +7,20 @@ # ##===----------------------------------------------------------------------===## -LEVEL = ../../../.. - ifndef LLVMC_PLUGIN -$(error LLVMC_PLUGIN variable is not defined!) -endif + +LEVEL = ../../.. +DIRS = $(BUILTIN_PLUGINS) + +# TOFIX: DSO versions of plugins are not built + +export BUILTIN_LLVMC_PLUGIN=1 + +include $(LEVEL)/Makefile.common + +else # LLVMC_PLUGIN + +LEVEL = ../../../.. LIBRARYNAME = $(patsubst %,LLVMC%,$(LLVMC_PLUGIN)) TOOLS_SOURCE = $(wildcard $(PROJ_SRC_DIR)/*.td) @@ -40,4 +49,6 @@ $(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir \ AutoGenerated.inc : $(ObjDir)/AutoGenerated.inc.tmp $(Verb) $(CMP) -s $@ $< || $(CP) $< $@ -endif +endif # BUILD_AUTOGENERATED_INC + +endif # LLVMC_PLUGIN |