Mercurial > hg > truffle
comparison make/bsd/makefiles/vm.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 | c77d473e71f7 |
children | 33df1aeaebbf 2d503de963b3 |
comparison
equal
deleted
inserted
replaced
4890:c77d473e71f7 | 4891:719f7007c8e8 |
---|---|
80 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" | 80 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" |
81 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" | 81 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" |
82 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" | 82 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" |
83 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" | 83 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" |
84 | 84 |
85 CPPFLAGS = \ | 85 CXXFLAGS = \ |
86 ${SYSDEFS} \ | 86 ${SYSDEFS} \ |
87 ${INCLUDES} \ | 87 ${INCLUDES} \ |
88 ${BUILD_VERSION} \ | 88 ${BUILD_VERSION} \ |
89 ${BUILD_TARGET} \ | 89 ${BUILD_TARGET} \ |
90 ${BUILD_USER} \ | 90 ${BUILD_USER} \ |
92 ${VM_DISTRO} | 92 ${VM_DISTRO} |
93 | 93 |
94 # This is VERY important! The version define must only be supplied to vm_version.o | 94 # This is VERY important! The version define must only be supplied to vm_version.o |
95 # If not, ccache will not re-use the cache at all, since the version string might contain | 95 # If not, ccache will not re-use the cache at all, since the version string might contain |
96 # a time and date. | 96 # a time and date. |
97 vm_version.o: CPPFLAGS += ${JRE_VERSION} | 97 vm_version.o: CXXFLAGS += ${JRE_VERSION} |
98 | 98 |
99 ifdef DEFAULT_LIBPATH | 99 ifdef DEFAULT_LIBPATH |
100 CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" | 100 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" |
101 endif | 101 endif |
102 | 102 |
103 ifndef JAVASE_EMBEDDED | 103 ifndef JAVASE_EMBEDDED |
104 CFLAGS += -DINCLUDE_TRACE | 104 CFLAGS += -DINCLUDE_TRACE |
105 endif | 105 endif |
262 # get around library dependency and compatibility issues. Must use gcc not | 262 # get around library dependency and compatibility issues. Must use gcc not |
263 # g++ to link. | 263 # g++ to link. |
264 ifeq ($(STATIC_CXX), true) | 264 ifeq ($(STATIC_CXX), true) |
265 LFLAGS_VM += $(STATIC_LIBGCC) | 265 LFLAGS_VM += $(STATIC_LIBGCC) |
266 LIBS_VM += $(STATIC_STDCXX) | 266 LIBS_VM += $(STATIC_STDCXX) |
267 LINK_VM = $(LINK_LIB.c) | 267 LINK_VM = $(LINK_LIB.CC) |
268 else | 268 else |
269 LINK_VM = $(LINK_LIB.CC) | 269 LINK_VM = $(LINK_LIB.CXX) |
270 endif | 270 endif |
271 | 271 |
272 LIBS_VM += $(LIBS) | 272 LIBS_VM += $(LIBS) |
273 endif | 273 endif |
274 ifeq ($(ZERO_BUILD), true) | 274 ifeq ($(ZERO_BUILD), true) |
282 | 282 |
283 # rule for building precompiled header | 283 # rule for building precompiled header |
284 $(PRECOMPILED_HEADER): | 284 $(PRECOMPILED_HEADER): |
285 $(QUIETLY) echo Generating precompiled header $@ | 285 $(QUIETLY) echo Generating precompiled header $@ |
286 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) | 286 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) |
287 $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) | 287 $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) |
288 | 288 |
289 # making the library: | 289 # making the library: |
290 | 290 |
291 ifneq ($(JVM_BASE_ADDR),) | 291 ifneq ($(JVM_BASE_ADDR),) |
292 # By default shared library is linked at base address == 0. Modify the | 292 # By default shared library is linked at base address == 0. Modify the |
307 endif | 307 endif |
308 | 308 |
309 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) | 309 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) |
310 $(QUIETLY) { \ | 310 $(QUIETLY) { \ |
311 echo Linking vm...; \ | 311 echo Linking vm...; \ |
312 $(LINK_LIB.CC/PRE_HOOK) \ | 312 $(LINK_LIB.CXX/PRE_HOOK) \ |
313 $(LINK_VM) $(LD_SCRIPT_FLAG) \ | 313 $(LINK_VM) $(LD_SCRIPT_FLAG) \ |
314 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ | 314 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ |
315 $(LINK_LIB.CC/POST_HOOK) \ | 315 $(LINK_LIB.CXX/POST_HOOK) \ |
316 rm -f $@.1; ln -s $@ $@.1; \ | 316 rm -f $@.1; ln -s $@ $@.1; \ |
317 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | 317 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ |
318 } | 318 } |
319 | 319 |
320 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) | 320 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) |