equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
50 OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build |
50 OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build |
51 SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_DIR)) |
51 SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_DIR)) |
52 |
52 |
53 JAVA_CMD:=$(BOOT_JDK)/bin/java |
53 JAVA_CMD:=$(BOOT_JDK)/bin/java |
54 JAVAC_CMD:=$(BOOT_JDK)/bin/javac |
54 JAVAC_CMD:=$(BOOT_JDK)/bin/javac |
55 JAVAH_CMD:=$(BOOT_JDK)/bin/javah |
|
56 JAR_CMD:=$(BOOT_JDK)/bin/jar |
55 JAR_CMD:=$(BOOT_JDK)/bin/jar |
57 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner |
56 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner |
58 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD) |
57 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD) |
59 # When building a 32bit target, make sure the sjavac server flags are compatible |
58 # When building a 32bit target, make sure the sjavac server flags are compatible |
60 # with a 32bit JVM. |
59 # with a 32bit JVM. |