make/common/modules/LauncherCommon.gmk

rev 59383 : [mq]: final

*** 38,49 ****
  ifeq ($(TOOLCHAIN_TYPE), gcc)
    LAUNCHER_CFLAGS += -fvisibility=hidden
    LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
  else ifeq ($(TOOLCHAIN_TYPE), clang)
    LAUNCHER_CFLAGS += -fvisibility=hidden
- else ifeq ($(TOOLCHAIN_TYPE), solstudio)
-   LAUNCHER_CFLAGS += -xldscope=hidden
  endif
  
  LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
  LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
      -I$(TOPDIR)/src/java.base/share/native/libjli \
--- 38,47 ----
*** 141,168 ****
            $$(LAUNCHER_CFLAGS) \
            $$(VERSION_CFLAGS) \
            -DLAUNCHER_NAME='"$$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' \
            $$($1_CFLAGS), \
-       CFLAGS_solaris := -KPIC, \
        CFLAGS_windows := $$($1_CFLAGS_windows), \
        DISABLED_WARNINGS_gcc := unused-function, \
        LDFLAGS := $$(LDFLAGS_JDKEXE) \
            $$(call SET_EXECUTABLE_ORIGIN) \
            $$($1_LDFLAGS), \
        LDFLAGS_linux := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
            -L$(call FindLibDirForModule, java.base), \
        LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
            -L$(call FindLibDirForModule, java.base), \
-       LDFLAGS_solaris := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
-           -L$(call FindLibDirForModule, java.base), \
        LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \
        LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
        LIBS_linux := -ljli -lpthread $(LIBDL), \
        LIBS_macosx := -ljli -framework Cocoa -framework Security \
            -framework ApplicationServices, \
-       LIBS_solaris := -ljli -lthread $(LIBDL), \
        LIBS_aix := -ljli_static, \
        LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
            $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib, \
        OUTPUT_DIR := $$($1_OUTPUT_DIR), \
        VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
--- 139,162 ----