make/launcher/Launcher-java.base.gmk

rev 16488 : 8174242: simplify jexec build settings

*** 69,136 ****
      MAIN_CLASS := sun.security.tools.keytool.Main, \
  ))
  
  ################################################################################
  
- BUILD_JEXEC :=
- BUILD_JEXEC_SRC :=
- BUILD_JEXEC_INC :=
- BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
- 
- #
- # UNHANDLED:
- # - COMPILE_APPROACH = normal
- #
- 
- #
- # jdk/make/java/Makefile
- #
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-   ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-     BUILD_JEXEC := 1
-   endif
- endif
- 
  ifeq ($(OPENJDK_TARGET_OS), linux)
!   BUILD_JEXEC := 1
! endif # OPENJDK_TARGET_OS
! 
! #
! # jdk/make/java/jexec/Makefile
! #
! ifeq ($(BUILD_JEXEC), 1)
! 
!   ifeq ($(OPENJDK_TARGET_OS), windows)
!   else ifeq ($(OPENJDK_TARGET_OS), macosx)
!     BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/macosx/native/launcher
!   else
!     BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/launcher
!   endif
! 
!   ifeq ($(OPENJDK_TARGET_OS), linux)
!     BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
!     BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/java.base/share/native/libjli
!   endif
! endif
! 
! #
! # Note that the two Makefile's seems to contradict each other,
! # and that src/macosx/bin/jexec.c seems unused
! #
! ifneq ($(BUILD_JEXEC_SRC), )
!   $(eval $(call SetupNativeCompilation,BUILD_JEXEC, \
!       SRC := $(BUILD_JEXEC_SRC), \
        INCLUDE_FILES := jexec.c, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) \
!           $(BUILD_JEXEC_INC), \
        CFLAGS_linux := -fPIC, \
        CFLAGS_solaris := -KPIC, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
!       OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
!       PROGRAM := jexec))
  
    TARGETS += $(BUILD_JEXEC)
  endif
  
  ################################################################################
--- 69,92 ----
      MAIN_CLASS := sun.security.tools.keytool.Main, \
  ))
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), linux)
!   $(eval $(call SetupNativeCompilation, BUILD_JEXEC, \
!       SRC := $(JDK_TOPDIR)/src/$(MODULE)/unix/native/launcher, \
        INCLUDE_FILES := jexec.c, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) \
!           -I$(JDK_TOPDIR)/src/$(MODULE)/share/native/libjli, \
        CFLAGS_linux := -fPIC, \
        CFLAGS_solaris := -KPIC, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
!       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
!       PROGRAM := jexec, \
!   ))
  
    TARGETS += $(BUILD_JEXEC)
  endif
  
  ################################################################################