Mercurial > hg > truffle

comparison make/bsd/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 e8a4934564b2
children 15ba0e7a3ff4
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
69 endif 69 endif
70 70
71 LIBS_LAUNCHER += -l$(JVM) $(LIBS) 71 LIBS_LAUNCHER += -l$(JVM) $(LIBS)
72 endif 72 endif
73 73
74 LINK_LAUNCHER = $(LINK.c) 74 LINK_LAUNCHER = $(LINK.CC)
75 75
76 LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK) 76 LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
77 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) 77 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
78 78
79 LAUNCHER_OUT = launcher 79 LAUNCHER_OUT = launcher
80 80
81 SUFFIXES += .d 81 SUFFIXES += .d
82 82
88 DEPFILES := $(patsubst %.o,%.d,$(OBJS)) 88 DEPFILES := $(patsubst %.o,%.d,$(OBJS))
89 -include $(DEPFILES) 89 -include $(DEPFILES)
90 90
91 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c 91 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.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_OUT)/%.o: $(LAUNCHERDIR)/%.c 95 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
96 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 96 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
97 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 97 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
98 98
99 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 99 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
100 $(QUIETLY) echo Linking launcher... 100 $(QUIETLY) echo Linking launcher...
101 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) 101 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
102 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) 102 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)