make/launcher/LauncherCommon.gmk

rev 54541 : 8222510: Small cleanup for JDK launcher's make file
Reviewed-by:

*** 71,82 ****
  # EXTRA_JAVA_ARGS Processed into a -DEXTRA_JAVA_ARGS and is prepended
  #     before JAVA_ARGS to CFLAGS, primarily to allow long string literal
  #     compile time defines exceeding Visual Studio 2013 limitations.
  # CFLAGS   Additional CFLAGS
  # CFLAGS_windows   Additional CFLAGS_windows
! # LDFLAGS_solaris Additional LDFLAGS_solaris
! # RC_FLAGS   Additional RC_FLAGS
  # MACOSX_SIGNED   On macosx, sign this binary
  # OPTIMIZATION   Override default optimization level (LOW)
  # OUTPUT_DIR   Override default output directory
  # VERSION_INFO_RESOURCE   Override default Windows resource file
  SetupBuildLauncher = $(NamedParamsMacroTemplate)
--- 71,81 ----
  # EXTRA_JAVA_ARGS Processed into a -DEXTRA_JAVA_ARGS and is prepended
  #     before JAVA_ARGS to CFLAGS, primarily to allow long string literal
  #     compile time defines exceeding Visual Studio 2013 limitations.
  # CFLAGS   Additional CFLAGS
  # CFLAGS_windows   Additional CFLAGS_windows
! # EXTRA_RC_FLAGS   Additional EXTRA_RC_FLAGS
  # MACOSX_SIGNED   On macosx, sign this binary
  # OPTIMIZATION   Override default optimization level (LOW)
  # OUTPUT_DIR   Override default output directory
  # VERSION_INFO_RESOURCE   Override default Windows resource file
  SetupBuildLauncher = $(NamedParamsMacroTemplate)
*** 137,147 ****
  
    $$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
        NAME := $1, \
        EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
        OPTIMIZATION := $$($1_OPTIMIZATION), \
!       CFLAGS := $$(CFLAGS_JDKEXE) $$($1_CFLAGS) \
            $(LAUNCHER_CFLAGS) \
            $(VERSION_CFLAGS) \
            -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' \
            $$($1_CFLAGS), \
--- 136,146 ----
  
    $$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
        NAME := $1, \
        EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
        OPTIMIZATION := $$($1_OPTIMIZATION), \
!       CFLAGS := $$(CFLAGS_JDKEXE) \
            $(LAUNCHER_CFLAGS) \
            $(VERSION_CFLAGS) \
            -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' \
            $$($1_CFLAGS), \