llvm.org GIT mirror llvm / 7cfbe25
Switch .bc/.ll Makefile rules to use LLVM{CC,CXX} instead of LLVMG{CC,XX} git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96936 91177308-0d34-0410-b5e6-96231b3b80d8 Daniel Dunbar 9 years ago
3 changed file(s) with 16 addition(s) and 16 deletion(s). Raw diff Collapse all Expand all
719719 $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
720720 endif
721721
722 BCCompile.C = $(LLVMGCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
722 BCCompile.C = $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
723723 $(TargetCommonOpts) $(CompileCommonOpts)
724724 Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) $(CPPFLAGS) \
725725 $(TargetCommonOpts) $(CompileCommonOpts) -E
726726
727 BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) \
727 BCCompile.CXX = $(LLVMCXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) \
728728 $(TargetCommonOpts) $(CompileCommonOpts)
729729
730730 ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755
978978 #---------------------------------------------------------
979979
980980 ifdef MODULE_NAME
981 ifeq ($(strip $(LLVMGCC)),)
982 $(warning Modules require llvm-gcc but no llvm-gcc is available ****)
981 ifeq ($(strip $(LLVMCC)),)
982 $(warning Modules require LLVM capable compiler but none is available ****)
983983 else
984984
985985 Module := $(LibDir)/$(MODULE_NAME).bc
11041104 # targets for building them.
11051105 #---------------------------------------------------------
11061106 ifdef BYTECODE_LIBRARY
1107 ifeq ($(strip $(LLVMGCC)),)
1108 $(warning Bytecode libraries require llvm-gcc which could not be found ****)
1107 ifeq ($(strip $(LLVMCC)),)
1108 $(warning Bytecode libraries require LLVM capable compiler but none is available ****)
11091109 else
11101110
11111111 all-local:: $(LibName.BCA)
13881388 BC_DEPEND_MOVEFILE = then $(MV) -f "$(ObjDir)/$*.bc.d.tmp" "$(ObjDir)/$*.bc.d"; \
13891389 else $(RM) "$(ObjDir)/$*.bc.d.tmp"; exit 1; fi
13901390
1391 $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX)
1391 $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCXX)
13921392 $(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
13931393 $(Verb) if $(BCCompile.CXX) $(BC_DEPEND_OPTIONS) \
13941394 $< -o $(ObjDir)/$*.ll -S -emit-llvm ; \
13951395 $(BC_DEPEND_MOVEFILE)
13961396
1397 $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX)
1397 $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCXX)
13981398 $(Echo) "Compiling $*.cc for $(BuildMode) build (bytecode)"
13991399 $(Verb) if $(BCCompile.CXX) $(BC_DEPEND_OPTIONS) \
14001400 $< -o $(ObjDir)/$*.ll -S -emit-llvm ; \
14011401 $(BC_DEPEND_MOVEFILE)
14021402
1403 $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGCC)
1403 $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCC)
14041404 $(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
14051405 $(Verb) if $(BCCompile.C) $(BC_DEPEND_OPTIONS) \
14061406 $< -o $(ObjDir)/$*.ll -S -emit-llvm ; \
14211421 $(Echo) "Compiling $*.c for $(BuildMode) build" $(PIC_FLAG)
14221422 $(Compile.C) $< -o $@
14231423
1424 $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX)
1424 $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCXX)
14251425 $(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
14261426 $(BCCompile.CXX) $< -o $@ -S -emit-llvm
14271427
1428 $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGXX)
1428 $(ObjDir)/%.ll: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCXX)
14291429 $(Echo) "Compiling $*.cc for $(BuildMode) build (bytecode)"
14301430 $(BCCompile.CXX) $< -o $@ -S -emit-llvm
14311431
1432 $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMGCC)
1432 $(ObjDir)/%.ll: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCC)
14331433 $(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
14341434 $(BCCompile.C) $< -o $@ -S -emit-llvm
14351435
99 LEVEL = ../..
1010 include $(LEVEL)/Makefile.config
1111
12 ifneq ($(wildcard $(LLVMGCC)),)
12 ifneq ($(strip $(LLVMCC)),)
1313 BYTECODE_LIBRARY = 1
1414 endif
1515 SHARED_LIBRARY = 1
4848
4949 # Compile from X.c to Output/X.ll
5050 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
51 -$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
51 -$(LLVMCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
5252
5353 # Compile from X.cpp to Output/X.ll
5454 Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
55 -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
55 -$(LLVMCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
5656
5757 # Compile from X.cc to Output/X.ll
5858 Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
59 -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
59 -$(LLVMCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
6060
6161 # LLVM Assemble from Output/X.ll to Output/X.bc. Output/X.ll must have come
6262 # from GCC output, so use GCCAS.