Mercurial > hg > truffle
diff make/solaris/makefiles/launcher.make @ 1547:fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
Reviewed-by: kamg, ysr, dholmes, johnc
| author | jcoomes |
|---|---|
| date | Tue, 18 May 2010 11:02:18 -0700 |
| parents | 167c2986d91b |
| children | c18cbe5936b8 |
line wrap: on
line diff
--- a/make/solaris/makefiles/launcher.make Mon May 17 00:47:28 2010 -0700 +++ b/make/solaris/makefiles/launcher.make Tue May 18 11:02:18 2010 -0700 @@ -80,15 +80,12 @@ } > $@ $(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE) +ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) + @echo Linking launcher... + $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) $(QUIETLY) \ - case "$(CFLAGS_BROWSE)" in \ - -sbfast|-xsbfast) \ - ;; \ - *) \ - echo Linking launcher...; \ - $(LINK_LAUNCHER/PRE_HOOK) \ - $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \ - $(LINK_LAUNCHER/POST_HOOK) \ - [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \ - ;; \ - esac + $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER) + $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) + [ -f $(LAUNCHER_G) ] || ln -s $@ $(LAUNCHER_G) +endif # filter -sbfast -xsbfast +