comparison make/solaris/makefiles/rules.make @ 4891:719f7007c8e8

7141242: build-infra merge: Rename CPP->CXX and LINK->LD Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker. Reviewed-by: dholmes, ohrstrom
author erikj
date Mon, 06 Feb 2012 09:14:22 +0100
parents 1d1603768966
children b9a9ed0f8eeb
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
25 # Common rules/macros for the vm, adlc. 25 # Common rules/macros for the vm, adlc.
26 26
27 # Tell make that .cpp is important 27 # Tell make that .cpp is important
28 .SUFFIXES: .cpp $(SUFFIXES) 28 .SUFFIXES: .cpp $(SUFFIXES)
29 29
30 # For now. Other makefiles use CPP as the c++ compiler, but that should really
31 # name the preprocessor.
32 ifeq ($(CCC),)
33 CCC = $(CPP)
34 endif
35
36 DEMANGLER = c++filt 30 DEMANGLER = c++filt
37 DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ 31 DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
38 32
39 # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). 33 # $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
40 C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) 34 CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS)
41 CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) 35 CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
42 36
43 AS.S = $(AS) $(ASFLAGS) 37 AS.S = $(AS) $(ASFLAGS)
44 38
45 COMPILE.c = $(C_COMPILE) -c 39 COMPILE.CC = $(CC_COMPILE) -c
46 GENASM.c = $(C_COMPILE) -S 40 GENASM.CC = $(CC_COMPILE) -S
47 LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 41 LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
48 LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG) 42 LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG)
49 PREPROCESS.c = $(C_COMPILE) -E 43 PREPROCESS.CC = $(CC_COMPILE) -E
50 44
51 COMPILE.CC = $(CC_COMPILE) -c 45 COMPILE.CXX = $(CXX_COMPILE) -c
52 GENASM.CC = $(CC_COMPILE) -S 46 GENASM.CXX = $(CXX_COMPILE) -S
53 LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS) 47 LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
54 LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) 48 LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS)
55 LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG) 49 LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG)
56 PREPROCESS.CC = $(CC_COMPILE) -E 50 PREPROCESS.CXX = $(CXX_COMPILE) -E
57 51
58 # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k". 52 # Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k".
59 REMOVE_TARGET = rm -f $@ 53 REMOVE_TARGET = rm -f $@
60
61 # Synonyms.
62 COMPILE.cpp = $(COMPILE.CC)
63 GENASM.cpp = $(GENASM.CC)
64 LINK.cpp = $(LINK.CC)
65 LINK_LIB.cpp = $(LINK_LIB.CC)
66 PREPROCESS.cpp = $(PREPROCESS.CC)
67 54
68 # Note use of ALT_BOOTDIR to explicitly specify location of java and 55 # Note use of ALT_BOOTDIR to explicitly specify location of java and
69 # javac; this is the same environment variable used in the J2SE build 56 # javac; this is the same environment variable used in the J2SE build
70 # process for overriding the default spec, which is BOOTDIR. 57 # process for overriding the default spec, which is BOOTDIR.
71 # Note also that we fall back to using JAVA_HOME if neither of these is 58 # Note also that we fall back to using JAVA_HOME if neither of these is
151 # Sun compiler for 64 bit Solaris does not support building non-PIC object files. 138 # Sun compiler for 64 bit Solaris does not support building non-PIC object files.
152 ifdef LP64 139 ifdef LP64
153 %.o: %.cpp 140 %.o: %.cpp
154 @echo Compiling $< 141 @echo Compiling $<
155 $(QUIETLY) $(REMOVE_TARGET) 142 $(QUIETLY) $(REMOVE_TARGET)
156 $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) 143 $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
157 else 144 else
158 %.o: %.cpp 145 %.o: %.cpp
159 @echo Compiling $< 146 @echo Compiling $<
160 $(QUIETLY) $(REMOVE_TARGET) 147 $(QUIETLY) $(REMOVE_TARGET)
161 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ 148 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
162 $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ 149 $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
163 $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) 150 $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
164 endif 151 endif
165 152
166 %.o: %.s 153 %.o: %.s
167 @echo Assembling $< 154 @echo Assembling $<
168 $(QUIETLY) $(REMOVE_TARGET) 155 $(QUIETLY) $(REMOVE_TARGET)
169 $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE) 156 $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE)
170 157
171 %.s: %.cpp 158 %.s: %.cpp
172 @echo Generating assembly for $< 159 @echo Generating assembly for $<
173 $(QUIETLY) $(GENASM.CC) -o $@ $< 160 $(QUIETLY) $(GENASM.CXX) -o $@ $<
174 $(QUIETLY) $(DEMANGLE) $(COMPILE_DONE) 161 $(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
175 162
176 # Intermediate files (for debugging macros) 163 # Intermediate files (for debugging macros)
177 %.i: %.cpp 164 %.i: %.cpp
178 @echo Preprocessing $< to $@ 165 @echo Preprocessing $< to $@
179 $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE) 166 $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
180 167
181 # Override gnumake built-in rules which do sccs get operations badly. 168 # Override gnumake built-in rules which do sccs get operations badly.
182 # (They put the checked out code in the current directory, not in the 169 # (They put the checked out code in the current directory, not in the
183 # directory of the original file.) Since this is a symptom of a teamware 170 # directory of the original file.) Since this is a symptom of a teamware
184 # failure, and since not all problems can be detected by gnumake due 171 # failure, and since not all problems can be detected by gnumake due