jdk/make/launcher/Launcher-java.base.gmk
changeset 43890 b7f6e347bda2
parent 43618 6ad08a95d2db
equal deleted inserted replaced
43889:212e765112d4 43890:b7f6e347bda2
    69     MAIN_CLASS := sun.security.tools.keytool.Main, \
    69     MAIN_CLASS := sun.security.tools.keytool.Main, \
    70 ))
    70 ))
    71 
    71 
    72 ################################################################################
    72 ################################################################################
    73 
    73 
    74 BUILD_JEXEC :=
       
    75 BUILD_JEXEC_SRC :=
       
    76 BUILD_JEXEC_INC :=
       
    77 BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
       
    78 
       
    79 #
       
    80 # UNHANDLED:
       
    81 # - COMPILE_APPROACH = normal
       
    82 #
       
    83 
       
    84 #
       
    85 # jdk/make/java/Makefile
       
    86 #
       
    87 ifeq ($(OPENJDK_TARGET_OS), solaris)
       
    88   ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
       
    89     BUILD_JEXEC := 1
       
    90   endif
       
    91 endif
       
    92 
       
    93 ifeq ($(OPENJDK_TARGET_OS), linux)
    74 ifeq ($(OPENJDK_TARGET_OS), linux)
    94   BUILD_JEXEC := 1
    75   $(eval $(call SetupNativeCompilation, BUILD_JEXEC, \
    95 endif # OPENJDK_TARGET_OS
    76       SRC := $(JDK_TOPDIR)/src/$(MODULE)/unix/native/launcher, \
    96 
       
    97 #
       
    98 # jdk/make/java/jexec/Makefile
       
    99 #
       
   100 ifeq ($(BUILD_JEXEC), 1)
       
   101 
       
   102   ifeq ($(OPENJDK_TARGET_OS), windows)
       
   103   else ifeq ($(OPENJDK_TARGET_OS), macosx)
       
   104     BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/macosx/native/launcher
       
   105   else
       
   106     BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/launcher
       
   107   endif
       
   108 
       
   109   ifeq ($(OPENJDK_TARGET_OS), linux)
       
   110     BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
       
   111     BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/java.base/share/native/libjli
       
   112   endif
       
   113 endif
       
   114 
       
   115 #
       
   116 # Note that the two Makefile's seems to contradict each other,
       
   117 # and that src/macosx/bin/jexec.c seems unused
       
   118 #
       
   119 ifneq ($(BUILD_JEXEC_SRC), )
       
   120   $(eval $(call SetupNativeCompilation,BUILD_JEXEC, \
       
   121       SRC := $(BUILD_JEXEC_SRC), \
       
   122       INCLUDE_FILES := jexec.c, \
    77       INCLUDE_FILES := jexec.c, \
   123       OPTIMIZATION := LOW, \
    78       OPTIMIZATION := LOW, \
   124       CFLAGS := $(CFLAGS_JDKEXE) \
    79       CFLAGS := $(CFLAGS_JDKEXE) \
   125           $(BUILD_JEXEC_INC), \
    80           -I$(JDK_TOPDIR)/src/$(MODULE)/share/native/libjli, \
   126       CFLAGS_linux := -fPIC, \
    81       CFLAGS_linux := -fPIC, \
   127       CFLAGS_solaris := -KPIC, \
    82       CFLAGS_solaris := -KPIC, \
   128       LDFLAGS := $(LDFLAGS_JDKEXE), \
    83       LDFLAGS := $(LDFLAGS_JDKEXE), \
   129       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
    84       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
   130       OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
    85       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
   131       PROGRAM := jexec))
    86       PROGRAM := jexec, \
       
    87   ))
   132 
    88 
   133   TARGETS += $(BUILD_JEXEC)
    89   TARGETS += $(BUILD_JEXEC)
   134 endif
    90 endif
   135 
    91 
   136 ################################################################################
    92 ################################################################################