make/autoconf/bootcycle-spec.gmk.in
author ihse
Mon, 04 Nov 2019 11:15:45 +0100
changeset 58909 66f7d2494d4e
parent 55453 65916ade7fa2
permissions -rw-r--r--
8233383: Various minor fixes Reviewed-by: erikj
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     1
#
48406
26b47ea4c77d 8193512: Remove remnants of javah from jdk/jdk repo
jjg
parents: 47364
diff changeset
     2
# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     4
#
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    10
#
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    15
# accompanied this code).
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    16
#
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    20
#
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    23
# questions.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    24
#
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    25
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    26
# Support for building boot cycle builds
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    27
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    28
# First include the real base spec.gmk file
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    29
include @SPEC@
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    30
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    31
# Check that the user did not try to specify a different java to use for compiling.
16578
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    32
# On windows we need to account for fixpath being first word.
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    33
ifeq ($(firstword $(JAVA)),$(FIXPATH))
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    34
  JAVA_EXEC_POS=2
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    35
else
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    36
  JAVA_EXEC_POS=1
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    37
endif
16578
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    38
ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16578
diff changeset
    39
  $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
16578
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    40
endif
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    41
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    42
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    43
# Override specific values to do a boot cycle build
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    44
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26907
diff changeset
    45
# Use a different Boot JDK
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26907
diff changeset
    46
BOOT_JDK := $(JDK_IMAGE_DIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26907
diff changeset
    47
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents:
diff changeset
    48
# The bootcycle build has a different output directory
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47216
diff changeset
    49
OLD_OUTPUTDIR:=@OUTPUTDIR@
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47216
diff changeset
    50
OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47216
diff changeset
    51
SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_DIR))
16578
7a35b47cb9e5 8006828: "SKIP_BOOT_CYCLE=false" must work in new building infrastructure
erikj
parents: 13697
diff changeset
    52
26907
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 20363
diff changeset
    53
JAVA_CMD:=$(BOOT_JDK)/bin/java
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 20363
diff changeset
    54
JAVAC_CMD:=$(BOOT_JDK)/bin/javac
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 20363
diff changeset
    55
JAR_CMD:=$(BOOT_JDK)/bin/jar
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 20363
diff changeset
    56
JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
da70acacfe57 8059658: Bootcycle build not actually using built image
erikj
parents: 20363
diff changeset
    57
SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
34105
ce71d2b2f34b 8144172: Problem with bootcycle-images and sjavac
erikj
parents: 30093
diff changeset
    58
# When building a 32bit target, make sure the sjavac server flags are compatible
ce71d2b2f34b 8144172: Problem with bootcycle-images and sjavac
erikj
parents: 30093
diff changeset
    59
# with a 32bit JVM.
ce71d2b2f34b 8144172: Problem with bootcycle-images and sjavac
erikj
parents: 30093
diff changeset
    60
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
39189
bae461399d89 8160571: Bootcycle builds still broken with server jvm on Windows 32bit
erikj
parents: 39187
diff changeset
    61
  SJAVAC_SERVER_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
34105
ce71d2b2f34b 8144172: Problem with bootcycle-images and sjavac
erikj
parents: 30093
diff changeset
    62
endif
39187
9decd6e374e2 8160285: Bootcycle builds are broken on jdk9/hs for windows i586
erikj
parents: 36506
diff changeset
    63
# The bootcycle JVM arguments may differ from the original boot jdk.
9decd6e374e2 8160285: Bootcycle builds are broken on jdk9/hs for windows i586
erikj
parents: 36506
diff changeset
    64
JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
55453
65916ade7fa2 8226404: bootcycle build uses wrong CDS archive
erikj
parents: 48406
diff changeset
    65
# Any CDS settings generated for the bootjdk are invalid in the bootcycle build.
65916ade7fa2 8226404: bootcycle build uses wrong CDS archive
erikj
parents: 48406
diff changeset
    66
# By filtering out those JVM args, the bootcycle JVM will use its default
65916ade7fa2 8226404: bootcycle build uses wrong CDS archive
erikj
parents: 48406
diff changeset
    67
# settings for CDS.
65916ade7fa2 8226404: bootcycle build uses wrong CDS archive
erikj
parents: 48406
diff changeset
    68
JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))