maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix build breakage when objdir!=srcdir (proper fix). 

llvm-svn: 56999
This commit is contained in:
Mikhail Glushenkov 2008-10-03 10:26:37 +00:00
parent 657e1c5c96
commit bb63f929d5
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/tools/llvmc2/Makefile
View File

@ -11,10 +11,9 @@ LEVEL = ../..
BUILTIN_PLUGINS = Base BUILTIN_PLUGINS = Base
DRIVER_NAME = llvmc2 DRIVER_NAME = llvmc2
DIRS = $(patsubst %,plugins/%,$(BUILTIN_PLUGINS)) src DIRS = plugins src
export BUILTIN_PLUGINS export BUILTIN_PLUGINS
export DRIVER_NAME export DRIVER_NAME
export BUILTIN_LLVMC_PLUGIN=1
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

2
llvm/tools/llvmc2/plugins/Base/Makefile
View File

@ -9,4 +9,4 @@
LLVMC_PLUGIN = Base LLVMC_PLUGIN = Base
include ../Makefile.plugins include ../Makefile

2
llvm/tools/llvmc2/plugins/Clang/Makefile
View File

@ -9,5 +9,5 @@
LLVMC_PLUGIN = Clang LLVMC_PLUGIN = Clang
include ../Makefile.plugins include ../Makefile

2
llvm/tools/llvmc2/plugins/Hello/Makefile
View File

@ -9,4 +9,4 @@
LLVMC_PLUGIN = Hello LLVMC_PLUGIN = Hello
include ../Makefile.plugins include ../Makefile

21
llvm/tools/llvmc2/plugins/Makefile.plugins → llvm/tools/llvmc2/plugins/Makefile
View File

@ -7,11 +7,20 @@
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../../../..
ifndef LLVMC_PLUGIN 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)) LIBRARYNAME = $(patsubst %,LLVMC%,$(LLVMC_PLUGIN))
TOOLS_SOURCE = $(wildcard $(PROJ_SRC_DIR)/*.td) 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 AutoGenerated.inc : $(ObjDir)/AutoGenerated.inc.tmp
$(Verb) $(CMP) -s $@ $< || $(CP) $< $@ $(Verb) $(CMP) -s $@ $< || $(CP) $< $@
endif endif # BUILD_AUTOGENERATED_INC
endif # LLVMC_PLUGIN