makefiles/CompileLaunchers.gmk

rev 7983 : 8024265: Enable new build on AIX

@@ -104,10 +104,14 @@
                       -framework Cocoa -framework Security -framework ApplicationServices \
                       -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
         $1_LDFLAGS_SUFFIX += -pthread
     endif
 
+    ifeq ($(OPENJDK_TARGET_OS), aix)
+        $1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/objs -ljli_static
+    endif
+
     ifeq ($(USE_EXTERNAL_LIBZ), true)
         $1_LDFLAGS_SUFFIX += -lz
     endif
 
     $1_OUTPUT_DIR_ARG:=$9

@@ -191,11 +195,11 @@
         MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\
         CODESIGN:=$$($1_CODESIGN))
 
     BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
 
-    ifeq ($(OPENJDK_TARGET_OS),macosx)
+    ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
         $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
     endif
 
     ifeq ($(OPENJDK_TARGET_OS),windows)
         $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \