Mercurial > hg > truffle

comparison make/solaris/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 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
74 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" 74 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
75 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" 75 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
76 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 76 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
77 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 77 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
78 78
79 CPPFLAGS = \ 79 CXXFLAGS = \
80 ${SYSDEFS} \ 80 ${SYSDEFS} \
81 ${INCLUDES} \ 81 ${INCLUDES} \
82 ${BUILD_VERSION} \ 82 ${BUILD_VERSION} \
83 ${BUILD_TARGET} \ 83 ${BUILD_TARGET} \
84 ${BUILD_USER} \ 84 ${BUILD_USER} \
86 ${VM_DISTRO} 86 ${VM_DISTRO}
87 87
88 # This is VERY important! The version define must only be supplied to vm_version.o 88 # This is VERY important! The version define must only be supplied to vm_version.o
89 # If not, ccache will not re-use the cache at all, since the version string might contain 89 # If not, ccache will not re-use the cache at all, since the version string might contain
90 # a time and date. 90 # a time and date.
91 vm_version.o: CPPFLAGS += ${JRE_VERSION} 91 vm_version.o: CXXFLAGS += ${JRE_VERSION}
92 92
93 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 93 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
94 CFLAGS += $(CFLAGS_WARN) 94 CFLAGS += $(CFLAGS_WARN)
95 95
96 # Do not use C++ exception handling 96 # Do not use C++ exception handling
267 LIBS_VM += $(STATIC_STDCXX) $(LIBS) 267 LIBS_VM += $(STATIC_STDCXX) $(LIBS)
268 endif 268 endif
269 endif 269 endif
270 270
271 ifdef USE_GCC 271 ifdef USE_GCC
272 LINK_VM = $(LINK_LIB.c)
273 else
274 LINK_VM = $(LINK_LIB.CC) 272 LINK_VM = $(LINK_LIB.CC)
273 else
274 LINK_VM = $(LINK_LIB.CXX)
275 endif 275 endif
276 # making the library: 276 # making the library:
277 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) 277 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
278 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) 278 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
279 @echo Linking vm... 279 @echo Linking vm...
280 $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) 280 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
281 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) 281 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM)
282 $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) 282 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
283 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 283 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
284 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) 284 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
285 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 285 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
286 ifneq ($(OBJCOPY),) 286 ifneq ($(OBJCOPY),)
287 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) 287 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)