Merge jdk8u102-b03

Fri, 15 Apr 2016 14:38:20 -0700

author
asaha
date
Fri, 15 Apr 2016 14:38:20 -0700
changeset 8417
ef01a1634bb4
parent 8416
d957cf0b00ac
parent 8338
d025821b6b6d
child 8418
c66e4cc0fce5

Merge

     1.1 --- a/make/windows/makefiles/sa.make	Mon Apr 11 14:58:21 2016 -0700
     1.2 +++ b/make/windows/makefiles/sa.make	Fri Apr 15 14:38:20 2016 -0700
     1.3 @@ -44,9 +44,11 @@
     1.4  HS_ALT_SRC_REL=src/closed
     1.5  HS_ALT_SRC = $(WorkSpace)/$(HS_ALT_SRC_REL)
     1.6  !ifndef HS_ALT_MAKE
     1.7 +!if exist($(WorkSpace)/make/closed)
     1.8  HS_ALT_MAKE=$(WorkSpace)/make/closed
     1.9  !endif
    1.10  !endif
    1.11 +!endif
    1.12  
    1.13  HS_COMMON_SRC = $(WorkSpace)/$(HS_COMMON_SRC_REL)
    1.14  

mercurial