make/launcher/LauncherCommon.gmk

Print this page 
rev 11065 : 8066589: Make importing sa-jdi.jar optional on its existance
Summary: Also fix the location where libjli_static.a is loaded from on AIX
Reviewed-by: erikj


  99   endif
 100 
 101   $1_LDFLAGS := $3
 102   $1_LDFLAGS_SUFFIX :=
 103   ifeq ($(OPENJDK_TARGET_OS), macosx)
 104     $1_PLIST_FILE := Info-cmdline.plist
 105     ifneq ($(11), )
 106       $1_PLIST_FILE := $(11)
 107       ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), )
 108         $1_CODESIGN := true
 109       endif
 110     endif
 111 
 112     $1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \
 113         -framework Cocoa -framework Security -framework ApplicationServices \
 114         -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE)
 115         $1_LDFLAGS_SUFFIX += -pthread
 116   endif
 117 
 118   ifeq ($(OPENJDK_TARGET_OS), aix)
 119     $1_LDFLAGS_SUFFIX += -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE) -ljli_static
 120   endif
 121 
 122   ifeq ($(USE_EXTERNAL_LIBZ), true)
 123     $1_LDFLAGS_SUFFIX += -lz
 124   endif
 125 
 126   $1_OUTPUT_DIR_ARG := $9
 127   ifeq (, $$($1_OUTPUT_DIR_ARG))
 128     $1_OUTPUT_DIR_ARG := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)
 129   endif
 130 
 131   # TODO: maybe it's better to move this if-statement out of this function
 132   ifeq ($1, java)
 133     $1_OPTIMIZATION_ARG := HIGH
 134     $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
 135   else
 136   $1_OPTIMIZATION_ARG := LOW
 137   endif
 138 
 139   $1_CFLAGS := $(CFLAGS_JDKEXE)




  99   endif
 100 
 101   $1_LDFLAGS := $3
 102   $1_LDFLAGS_SUFFIX :=
 103   ifeq ($(OPENJDK_TARGET_OS), macosx)
 104     $1_PLIST_FILE := Info-cmdline.plist
 105     ifneq ($(11), )
 106       $1_PLIST_FILE := $(11)
 107       ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), )
 108         $1_CODESIGN := true
 109       endif
 110     endif
 111 
 112     $1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \
 113         -framework Cocoa -framework Security -framework ApplicationServices \
 114         -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE)
 115         $1_LDFLAGS_SUFFIX += -pthread
 116   endif
 117 
 118   ifeq ($(OPENJDK_TARGET_OS), aix)
 119     $1_LDFLAGS_SUFFIX += -L$(SUPPORT_OUTPUTDIR)/native/java.base -ljli_static
 120   endif
 121 
 122   ifeq ($(USE_EXTERNAL_LIBZ), true)
 123     $1_LDFLAGS_SUFFIX += -lz
 124   endif
 125 
 126   $1_OUTPUT_DIR_ARG := $9
 127   ifeq (, $$($1_OUTPUT_DIR_ARG))
 128     $1_OUTPUT_DIR_ARG := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)
 129   endif
 130 
 131   # TODO: maybe it's better to move this if-statement out of this function
 132   ifeq ($1, java)
 133     $1_OPTIMIZATION_ARG := HIGH
 134     $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
 135   else
 136   $1_OPTIMIZATION_ARG := LOW
 137   endif
 138 
 139   $1_CFLAGS := $(CFLAGS_JDKEXE)