Mercurial > hg > graal-compiler

comparison make/solaris/makefiles/launcher.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 cb2d0a362639
children da91efe96a93
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
50 LAUNCHER.o = launcher.o 50 LAUNCHER.o = launcher.o
51 LFLAGS_LAUNCHER += -L `pwd` 51 LFLAGS_LAUNCHER += -L `pwd`
52 LIBS_LAUNCHER += -l$(JVM) $(LIBS) 52 LIBS_LAUNCHER += -l$(JVM) $(LIBS)
53 endif 53 endif
54 54
55 LINK_LAUNCHER = $(LINK.CC) 55 LINK_LAUNCHER = $(LINK.CXX)
56 56
57 LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK) 57 LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
58 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) 58 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
59 59
60 ifeq ("${Platform_compiler}", "sparcWorks") 60 ifeq ("${Platform_compiler}", "sparcWorks")
61 # Enable the following LAUNCHERFLAGS addition if you need to compare the 61 # Enable the following LAUNCHERFLAGS addition if you need to compare the
62 # built ELF objects. 62 # built ELF objects.
63 # 63 #
84 DEPFILES := $(patsubst %.o,%.d,$(OBJS)) 84 DEPFILES := $(patsubst %.o,%.d,$(OBJS))
85 -include $(DEPFILES) 85 -include $(DEPFILES)
86 86
87 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c 87 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
88 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 88 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
89 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 89 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
90 90
91 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c 91 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
92 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 92 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
93 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 93 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
94 94
95 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 95 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
96 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) 96 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
97 $(QUIETLY) echo Linking launcher... 97 $(QUIETLY) echo Linking launcher...
98 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) 98 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)