comparison make/windows/makefiles/sa.make @ 23974:f13e777eb255

Merge with jdk8u111-b14
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 16 Nov 2016 12:32:54 -0800
parents dd9cc155639c 01745e531a0a
children
comparison
equal deleted inserted replaced
23792:3953f8820df8 23974:f13e777eb255
42 42
43 !if "$(OPENJDK)" != "true" 43 !if "$(OPENJDK)" != "true"
44 HS_ALT_SRC_REL=src/closed 44 HS_ALT_SRC_REL=src/closed
45 HS_ALT_SRC = $(WorkSpace)/$(HS_ALT_SRC_REL) 45 HS_ALT_SRC = $(WorkSpace)/$(HS_ALT_SRC_REL)
46 !ifndef HS_ALT_MAKE 46 !ifndef HS_ALT_MAKE
47 !if exist($(WorkSpace)/make/closed)
47 HS_ALT_MAKE=$(WorkSpace)/make/closed 48 HS_ALT_MAKE=$(WorkSpace)/make/closed
49 !endif
48 !endif 50 !endif
49 !endif 51 !endif
50 52
51 HS_COMMON_SRC = $(WorkSpace)/$(HS_COMMON_SRC_REL) 53 HS_COMMON_SRC = $(WorkSpace)/$(HS_COMMON_SRC_REL)
52 54