diff options
| author | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2016-02-15 14:13:35 +0300 |
|---|---|---|
| committer | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2016-02-15 14:13:35 +0300 |
| commit | 7d0e3b05cb04908a0edf82e3f511f8232089ed94 (patch) | |
| tree | b078996391da979517a32ccb3d02099159a6c983 /make/windows/makefiles/sa.make | |
| parent | 24a09c463b2d328b6fc90ee555023514efca507c (diff) | |
| parent | 1a26ca0e98f70c3aa490787dfeca7358fa949a43 (diff) | |
| download | jdk8u_hotspot-7d0e3b05cb04908a0edf82e3f511f8232089ed94.tar.gz | |
Merged changes from defaultjetbrains-master-mirror-osx
--HG--
branch : 8u40-verified-fixes
Diffstat (limited to 'make/windows/makefiles/sa.make')
| -rw-r--r-- | make/windows/makefiles/sa.make | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/make/windows/makefiles/sa.make b/make/windows/makefiles/sa.make index 792f028f9..d75e2aa20 100644 --- a/make/windows/makefiles/sa.make +++ b/make/windows/makefiles/sa.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,22 @@ checkAndBuildSA:: GENERATED = ../generated +HS_COMMON_SRC_REL = src + +!if "$(OPENJDK)" != "true" +HS_ALT_SRC_REL=src/closed +HS_ALT_SRC = $(WorkSpace)/$(HS_ALT_SRC_REL) +!ifndef HS_ALT_MAKE +HS_ALT_MAKE=$(WorkSpace)/make/closed +!endif +!endif + +HS_COMMON_SRC = $(WorkSpace)/$(HS_COMMON_SRC_REL) + +!ifdef HS_ALT_MAKE +!include $(HS_ALT_MAKE)/windows/makefiles/sa.make +!endif + # tools.jar is needed by the JDI - SA binding SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar |