RFR: JDK-8143895: Fix LDFLAGS issues after JDK-8056925

[Erik Joelsson]

Sure, new patch:

diff -r 314ce60cae98 make/launcher/Launcher-jdk.accessibility.gmk
--- a/make/launcher/Launcher-jdk.accessibility.gmk      Mon Nov 23 
15:02:19 2015 -0800
+++ b/make/launcher/Launcher-jdk.accessibility.gmk      Tue Nov 24 
14:23:19 2015 +0100
@@ -73,8 +73,9 @@
      $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSINSPECTOR$1, \
        SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
            $(TOPDIR)/toolscommon $(TOPDIR)/include/bridge, \
-      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
-DACCESSBRIDGE_ARCH_$2 /EHsc, \
-      LDFLAGS := $$(LDFLAGS_JDKEXE) /STACK:655360 Advapi32.lib 
User32.lib, \
+      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
-DACCESSBRIDGE_ARCH_$2 -EHsc, \
+      LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
+      LIBS := advapi32.lib user32.lib, \
        OBJECT_DIR := 
$(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccessinspector$1, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
        PROGRAM := jaccessinspector$1, \
@@ -100,8 +101,9 @@
      $$(eval $$(call SetupNativeCompilation,BUILD_JACCESSWALKER$1, \
        SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
            $(TOPDIR)/toolscommon $(TOPDIR)/include/bridge, \
-      CFLAGS :== $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
-DACCESSBRIDGE_ARCH_$2 /EHsc, \
-      LDFLAGS := $$(LDFLAGS_JDKEXE) /STACK:655360 Advapi32.lib 
Comctl32.lib Gdi32.lib User32.lib, \
+      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
-DACCESSBRIDGE_ARCH_$2 -EHsc, \
+      LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
+      LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
        OBJECT_DIR := 
$(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccesswalker$1, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
        PROGRAM := jaccesswalker$1, \

Also noticed an extra '=' that I removed. It was causing warnings with 
cl.exe.

/Erik

On 2015-11-24 14:10, Magnus Ihse Bursie wrote:
> On 2015-11-24 14:00, Erik Joelsson wrote:
>> Please review this minor build fix.
> I'd prefer it if you use only lower case on the libs, as we do 
> elsewhere, and also on the -stack flag (as we do elsewhere for 
> pronouncable windows flags).
>
> /The Nit Picker :)
>
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8143895
>> Patch:
>> diff -r 314ce60cae98 make/launcher/Launcher-jdk.accessibility.gmk
>> --- a/make/launcher/Launcher-jdk.accessibility.gmk      Mon Nov 23 
>> 15:02:19 2015 -0800
>> +++ b/make/launcher/Launcher-jdk.accessibility.gmk      Tue Nov 24 
>> 13:58:08 2015 +0100
>> @@ -73,8 +73,9 @@
>>      $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSINSPECTOR$1, \
>>        SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
>>            $(TOPDIR)/toolscommon $(TOPDIR)/include/bridge, \
>> -      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
>> -DACCESSBRIDGE_ARCH_$2 /EHsc, \
>> -      LDFLAGS := $$(LDFLAGS_JDKEXE) /STACK:655360 Advapi32.lib 
>> User32.lib, \
>> +      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
>> -DACCESSBRIDGE_ARCH_$2 -EHsc, \
>> +      LDFLAGS := $$(LDFLAGS_JDKEXE) -STACK:655360, \
>> +      LIBS := Advapi32.lib User32.lib, \
>>        OBJECT_DIR := 
>> $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccessinspector$1, \
>>        OUTPUT_DIR := 
>> $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
>>        PROGRAM := jaccessinspector$1, \
>> @@ -100,8 +101,9 @@
>>      $$(eval $$(call SetupNativeCompilation,BUILD_JACCESSWALKER$1, \
>>        SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
>>            $(TOPDIR)/toolscommon $(TOPDIR)/include/bridge, \
>> -      CFLAGS :== $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
>> -DACCESSBRIDGE_ARCH_$2 /EHsc, \
>> -      LDFLAGS := $$(LDFLAGS_JDKEXE) /STACK:655360 Advapi32.lib 
>> Comctl32.lib Gdi32.lib User32.lib, \
>> +      CFLAGS :== $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) 
>> -DACCESSBRIDGE_ARCH_$2 -EHsc, \
>> +      LDFLAGS := $$(LDFLAGS_JDKEXE) -STACK:655360, \
>> +      LIBS := Advapi32.lib Comctl32.lib Gdi32.lib User32.lib, \
>>        OBJECT_DIR := 
>> $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccesswalker$1, \
>>        OUTPUT_DIR := 
>> $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
>>        PROGRAM := jaccesswalker$1, \
>>
>> /Erik
>