Mercurial > hg > truffle

comparison make/linux/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 33df1aeaebbf 37518f191ddb
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
52 LAUNCHER.o = launcher.o 52 LAUNCHER.o = launcher.o
53 LFLAGS_LAUNCHER += -L `pwd` 53 LFLAGS_LAUNCHER += -L `pwd`
54 LIBS_LAUNCHER += -l$(JVM) $(LIBS) 54 LIBS_LAUNCHER += -l$(JVM) $(LIBS)
55 endif 55 endif
56 56
57 LINK_LAUNCHER = $(LINK.c) 57 LINK_LAUNCHER = $(LINK.CC)
58 58
59 LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK) 59 LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
60 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) 60 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
61 61
62 LAUNCHER_OUT = launcher 62 LAUNCHER_OUT = launcher
63 63
64 SUFFIXES += .d 64 SUFFIXES += .d
65 65
71 DEPFILES := $(patsubst %.o,%.d,$(OBJS)) 71 DEPFILES := $(patsubst %.o,%.d,$(OBJS))
72 -include $(DEPFILES) 72 -include $(DEPFILES)
73 73
74 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c 74 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
75 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 75 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
76 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 76 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
77 77
78 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c 78 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
79 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); } 79 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
80 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS) 80 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
81 81
82 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) 82 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
83 $(QUIETLY) echo Linking launcher... 83 $(QUIETLY) echo Linking launcher...
84 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) 84 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
85 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) 85 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)