Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 4891:719f7007c8e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d652a62d6e03
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
86 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" 86 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
87 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" 87 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
88 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 88 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
89 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 89 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
90 90
91 CPPFLAGS = \ 91 CXXFLAGS = \
92 ${SYSDEFS} \ 92 ${SYSDEFS} \
93 ${INCLUDES} \ 93 ${INCLUDES} \
94 ${BUILD_VERSION} \ 94 ${BUILD_VERSION} \
95 ${BUILD_TARGET} \ 95 ${BUILD_TARGET} \
96 ${BUILD_USER} \ 96 ${BUILD_USER} \
98 ${VM_DISTRO} 98 ${VM_DISTRO}
99 99
100 # This is VERY important! The version define must only be supplied to vm_version.o 100 # This is VERY important! The version define must only be supplied to vm_version.o
101 # If not, ccache will not re-use the cache at all, since the version string might contain 101 # If not, ccache will not re-use the cache at all, since the version string might contain
102 # a time and date. 102 # a time and date.
103 vm_version.o: CPPFLAGS += ${JRE_VERSION} 103 vm_version.o: CXXFLAGS += ${JRE_VERSION}
104 104
105 ifndef JAVASE_EMBEDDED 105 ifndef JAVASE_EMBEDDED
106 CFLAGS += -DINCLUDE_TRACE 106 CFLAGS += -DINCLUDE_TRACE
107 endif 107 endif
108 108
274 ifeq ($(SHARK_BUILD), true) 274 ifeq ($(SHARK_BUILD), true)
275 LFLAGS_VM += $(LLVM_LDFLAGS) 275 LFLAGS_VM += $(LLVM_LDFLAGS)
276 LIBS_VM += $(LLVM_LIBS) 276 LIBS_VM += $(LLVM_LIBS)
277 endif 277 endif
278 278
279 LINK_VM = $(LINK_LIB.c) 279 LINK_VM = $(LINK_LIB.CC)
280 280
281 # rule for building precompiled header 281 # rule for building precompiled header
282 $(PRECOMPILED_HEADER): 282 $(PRECOMPILED_HEADER):
283 $(QUIETLY) echo Generating precompiled header $@ 283 $(QUIETLY) echo Generating precompiled header $@
284 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) 284 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
285 $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 285 $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
286 286
287 # making the library: 287 # making the library:
288 288
289 ifneq ($(JVM_BASE_ADDR),) 289 ifneq ($(JVM_BASE_ADDR),)
290 # By default shared library is linked at base address == 0. Modify the 290 # By default shared library is linked at base address == 0. Modify the
310 # DSO. To workaround that, we run chcon to libjvm.so after it is built. See 310 # DSO. To workaround that, we run chcon to libjvm.so after it is built. See
311 # details in bug 6538311. 311 # details in bug 6538311.
312 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) 312 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
313 $(QUIETLY) { \ 313 $(QUIETLY) { \
314 echo Linking vm...; \ 314 echo Linking vm...; \
315 $(LINK_LIB.CC/PRE_HOOK) \ 315 $(LINK_LIB.CXX/PRE_HOOK) \
316 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 316 $(LINK_VM) $(LD_SCRIPT_FLAG) \
317 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ 317 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
318 $(LINK_LIB.CC/POST_HOOK) \ 318 $(LINK_LIB.CXX/POST_HOOK) \
319 rm -f $@.1; ln -s $@ $@.1; \ 319 rm -f $@.1; ln -s $@ $@.1; \
320 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ 320 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
321 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ 321 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
322 if [ -x /usr/sbin/selinuxenabled ] ; then \ 322 if [ -x /usr/sbin/selinuxenabled ] ; then \
323 /usr/sbin/selinuxenabled; \ 323 /usr/sbin/selinuxenabled; \