1.1 --- a/make/linux/makefiles/launcher.make Tue Jan 31 13:12:39 2012 +0100
1.2 +++ b/make/linux/makefiles/launcher.make Mon Feb 06 09:14:22 2012 +0100
1.3 @@ -54,10 +54,10 @@
1.4 LIBS_LAUNCHER += -l$(JVM) $(LIBS)
1.5 endif
1.6
1.7 -LINK_LAUNCHER = $(LINK.c)
1.8 +LINK_LAUNCHER = $(LINK.CC)
1.9
1.10 -LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK)
1.11 -LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
1.12 +LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
1.13 +LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
1.14
1.15 LAUNCHER_OUT = launcher
1.16
1.17 @@ -73,11 +73,11 @@
1.18
1.19 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
1.20 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
1.21 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
1.22 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
1.23
1.24 $(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
1.25 $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
1.26 - $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
1.27 + $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
1.28
1.29 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
1.30 $(QUIETLY) echo Linking launcher...
