author | erikj |
Fri, 13 May 2016 09:21:20 +0200 | |
changeset 37867 | 379a6c51a588 |
parent 37402 | 62b5f067032e |
child 37969 | 2203863bfe3e |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
35747 | 2 |
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
26 |
# When you read this source. Remember that $(sort ...) has the side effect |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
27 |
# of removing duplicates. It is actually this side effect that is |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
28 |
# desired whenever sort is used below! |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
29 |
|
25854 | 30 |
ifndef _NATIVE_COMPILATION_GMK |
31 |
_NATIVE_COMPILATION_GMK := 1 |
|
32 |
||
20363 | 33 |
ifeq (,$(_MAKEBASE_GMK)) |
34 |
$(error You must include MakeBase.gmk prior to including NativeCompilation.gmk) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
35 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
36 |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
37 |
################################################################################ |
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
38 |
# Create exported symbols file for static libraries |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
39 |
################################################################################ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
40 |
|
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
41 |
# get the exported symbols from mapfiles and if there |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
42 |
# is no mapfile, get them from the archive |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
43 |
define GetSymbols |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
44 |
$(RM) $$(@D)/$$(basename $$(@F)).symbols; \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
45 |
if [ ! -z $$($1_MAPFILE) -a -e $$($1_MAPFILE) ]; then \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
46 |
$(ECHO) "Getting symbols from mapfile $$($1_MAPFILE)"; \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
47 |
$(AWK) '/global:/','/local:/' $$($1_MAPFILE) | \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
48 |
$(SED) -e 's/#.*//;s/global://;s/local://;s/\;//;s/^[ ]*/_/;/^_$$$$/d' | \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
49 |
$(EGREP) -v "JNI_OnLoad|JNI_OnUnload|Agent_OnLoad|Agent_OnUnload|Agent_OnAttach" > \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
50 |
$$(@D)/$$(basename $$(@F)).symbols || true; \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
51 |
$(NM) $$($1_TARGET) | $(GREP) " T " | \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
52 |
$(EGREP) "JNI_OnLoad|JNI_OnUnload|Agent_OnLoad|Agent_OnUnload|Agent_OnAttach" | \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
53 |
$(CUT) -d ' ' -f 3 >> $$(@D)/$$(basename $$(@F)).symbols || true;\ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
54 |
else \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
55 |
$(ECHO) "Getting symbols from nm"; \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
56 |
$(NM) -m $$($1_TARGET) | $(GREP) "__TEXT" | \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
57 |
$(EGREP) -v "non-external|private extern|__TEXT,__eh_frame" | \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
58 |
$(SED) -e 's/.* //' > $$(@D)/$$(basename $$(@F)).symbols; \ |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
59 |
fi |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
60 |
endef |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
61 |
|
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
62 |
################################################################################ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
63 |
# Define a native toolchain configuration that can be used by |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
64 |
# SetupNativeCompilation calls |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
65 |
# |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
66 |
# Parameter 1 is the name of the toolchain definition |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
67 |
# |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
68 |
# Remaining parameters are named arguments: |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
69 |
# EXTENDS - Optional parent definition to get defaults from |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
70 |
# CC - The C compiler |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
71 |
# CXX - The C++ compiler |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
72 |
# LD - The Linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
73 |
# AR - Static linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
74 |
# AS - Assembler |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
75 |
# MT - Windows MT tool |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
76 |
# RC - Windows RC tool |
36506 | 77 |
# OBJCOPY - The objcopy tool for debug symbol handling |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
78 |
# STRIP - The tool to use for stripping debug symbols |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
79 |
# SYSROOT_CFLAGS - Compiler flags for using the specific sysroot |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
80 |
# SYSROOT_LDFLAGS - Linker flags for using the specific sysroot |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
81 |
DefineNativeToolchain = $(NamedParamsMacroTemplate) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
82 |
define DefineNativeToolchainBody |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
83 |
# If extending another definition, get default values from that, |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
84 |
# otherwise, nothing more needs to be done as variable assignments |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
85 |
# already happened in NamedParamsMacroTemplate. |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
86 |
ifneq ($$($1_EXTENDS), ) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
87 |
$$(call SetIfEmpty, $1_CC, $$($$($1_EXTENDS)_CC)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
88 |
$$(call SetIfEmpty, $1_CXX, $$($$($1_EXTENDS)_CXX)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
89 |
$$(call SetIfEmpty, $1_LD, $$($$($1_EXTENDS)_LD)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
90 |
$$(call SetIfEmpty, $1_AR, $$($$($1_EXTENDS)_AR)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
91 |
$$(call SetIfEmpty, $1_AS, $$($$($1_EXTENDS)_AS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
92 |
$$(call SetIfEmpty, $1_MT, $$($$($1_EXTENDS)_MT)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
93 |
$$(call SetIfEmpty, $1_RC, $$($$($1_EXTENDS)_RC)) |
36506 | 94 |
$$(call SetIfEmpty, $1_OBJCOPY, $$($$($1_EXTENDS)_OBJCOPY)) |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
95 |
$$(call SetIfEmpty, $1_STRIP, $$($$($1_EXTENDS)_STRIP)) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
96 |
$$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$($$($1_EXTENDS)_SYSROOT_CFLAGS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
97 |
$$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$($$($1_EXTENDS)_SYSROOT_LDFLAGS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
98 |
endif |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
99 |
endef |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
100 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
101 |
# Create a default toolchain with the main compiler and linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
102 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_DEFAULT, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
103 |
CC := $(CC), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
104 |
CXX := $(CXX), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
105 |
LD := $(LD), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
106 |
AR := $(AR), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
107 |
AS := $(AS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
108 |
MT := $(MT), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
109 |
RC := $(RC), \ |
36506 | 110 |
OBJCOPY := $(OBJCOPY), \ |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
111 |
STRIP := $(STRIP), \ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
112 |
SYSROOT_CFLAGS := $(SYSROOT_CFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
113 |
SYSROOT_LDFLAGS := $(SYSROOT_LDFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
114 |
)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
115 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
116 |
# Create a toolchain where linking is done with the C++ linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
117 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_LINK_CXX, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
118 |
EXTENDS := TOOLCHAIN_DEFAULT, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
119 |
LD := $(LDCXX), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
120 |
)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
121 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
122 |
# Create a toolchain with the BUILD compiler, used for build tools that |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
123 |
# are to be run during the build. |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
124 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_BUILD, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
125 |
CC := $(BUILD_CC), \ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
126 |
CXX := $(BUILD_CXX), \ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
127 |
LD := $(BUILD_LD), \ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
128 |
AR := $(BUILD_AR), \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
129 |
AS := $(BUILD_AS), \ |
36506 | 130 |
OBJCOPY := $(BUILD_OBJCOPY), \ |
131 |
STRIP := $(BUILD_STRIP), \ |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
132 |
SYSROOT_CFLAGS := $(BUILD_SYSROOT_CFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
133 |
SYSROOT_LDFLAGS := $(BUILD_SYSROOT_LDFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
134 |
)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
135 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
136 |
# BUILD toolchain with the C++ linker |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
137 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_BUILD_LINK_CXX, \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
138 |
EXTENDS := TOOLCHAIN_BUILD, \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
139 |
LD := $(BUILD_LDCXX), \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
140 |
)) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
141 |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
142 |
################################################################################ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
143 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
144 |
# Extensions of files handled by this macro. |
35444 | 145 |
NATIVE_SOURCE_EXTENSIONS := %.s %.S %.c %.cpp %.cc %.m %.mm |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
146 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
147 |
# Replaces native source extensions with the object file extension in a string. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
148 |
# Param 1: the string containing source file names with extensions |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
149 |
# The surrounding strip is needed to keep additional whitespace out |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
150 |
define replace_with_obj_extension |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
151 |
$(strip \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
152 |
$(foreach extension, $(NATIVE_SOURCE_EXTENSIONS), \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
153 |
$(patsubst $(extension),%$(OBJ_SUFFIX),$(filter $(extension),$1))) \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
154 |
) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
155 |
endef |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
156 |
|
25882 | 157 |
ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin) |
158 |
UNIX_PATH_PREFIX := /cygdrive |
|
159 |
else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys) |
|
160 |
UNIX_PATH_PREFIX := |
|
161 |
endif |
|
162 |
||
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
163 |
# This pattern is used to transform the output of the microsoft CL compiler |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
164 |
# into a make syntax dependency file (.d) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
165 |
WINDOWS_SHOWINCLUDE_SED_PATTERN := \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
166 |
-e '/^Note: including file:/!d' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
167 |
-e 's|Note: including file: *||' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
168 |
-e 's|\\|/|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
169 |
-e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \ |
29436
91f4e8a8134f
8075054: Mixed case Windows path break native dependency checks
ihse
parents:
29312
diff
changeset
|
170 |
-e '\|$(TOPDIR)|I !d' \ |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
171 |
-e 's|$$$$| \\|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
172 |
# |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
173 |
|
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
174 |
# This pattern is used to transform a dependency file (.d) to a list |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
175 |
# of make targets for dependent files (.d.targets) |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
176 |
DEPENDENCY_TARGET_SED_PATTERN := \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
177 |
-e 's/\#.*//' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
178 |
-e 's/^[^:]*: *//' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
179 |
-e 's/ *\\$$$$//' \ |
29850
06864caf80e2
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29445
diff
changeset
|
180 |
-e 's/^[ ]*//' \ |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
181 |
-e '/^$$$$/ d' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
182 |
-e 's/$$$$/ :/' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
183 |
# |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
184 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
185 |
define add_native_source |
20363 | 186 |
# param 1 = BUILD_MYPACKAGE |
187 |
# parma 2 = the source file name (..../alfa.c or .../beta.cpp) |
|
188 |
# param 3 = the bin dir that stores all .o (.obj) and .d files. |
|
189 |
# param 4 = the c flags to the compiler |
|
190 |
# param 5 = the c compiler |
|
191 |
# param 6 = the c++ flags to the compiler |
|
192 |
# param 7 = the c++ compiler |
|
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
193 |
# param 8 = the flags to the assembler |
35747 | 194 |
# param 9 = set to disable THIS_FILE |
195 |
||
196 |
ifeq ($9, ) |
|
197 |
$1_$2_THIS_FILE = -DTHIS_FILE='"$$(<F)"' |
|
198 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
199 |
|
37402 | 200 |
ifeq ($$($1_$(notdir $2)_OPTIMIZATION), ) |
201 |
$1_$(notdir $2)_OPT_CFLAGS := $$($1_OPT_CFLAGS) |
|
202 |
$1_$(notdir $2)_OPT_CXXFLAGS := $$($1_OPT_CXXFLAGS) |
|
203 |
else |
|
204 |
ifeq (NONE, $$($1_$(notdir $2)_OPTIMIZATION)) |
|
205 |
$1_$(notdir $2)_OPT_CFLAGS := $(C_O_FLAG_NONE) |
|
206 |
$1_$(notdir $2)_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE) |
|
207 |
else ifeq (LOW, $$($1_$(notdir $2)_OPTIMIZATION)) |
|
208 |
$1_$(notdir $2)_OPT_CFLAGS := $(C_O_FLAG_NORM) |
|
209 |
$1_$(notdir $2)_OPT_CXXFLAGS := $(CXX_O_FLAG_NORM) |
|
210 |
else ifeq (HIGH, $$($1_$(notdir $2)_OPTIMIZATION)) |
|
211 |
$1_$(notdir $2)_OPT_CFLAGS := $(C_O_FLAG_HI) |
|
212 |
$1_$(notdir $2)_OPT_CXXFLAGS := $(CXX_O_FLAG_HI) |
|
213 |
else ifeq (HIGHEST, $$($1_$(notdir $2)_OPTIMIZATION)) |
|
214 |
$1_$(notdir $2)_OPT_CFLAGS := $(C_O_FLAG_HIGHEST) |
|
215 |
$1_$(notdir $2)_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST) |
|
216 |
else ifeq (HIGHEST_JVM, $$($1_$(notdir $2)_OPTIMIZATION)) |
|
217 |
$1_$(notdir $2)_OPT_CFLAGS := $(C_O_FLAG_HIGHEST_JVM) |
|
218 |
$1_$(notdir $2)_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST_JVM) |
|
219 |
else ifeq (SIZE, $$($1_$(notdir $2)_OPTIMIZATION)) |
|
220 |
$1_$(notdir $2)_OPT_CFLAGS := $(C_O_FLAG_SIZE) |
|
221 |
$1_$(notdir $2)_OPT_CXXFLAGS := $(CXX_O_FLAG_SIZE) |
|
222 |
else |
|
223 |
$$(error Unknown value for OPTIMIZATION: $$($1_$(notdir $2)_OPTIMIZATION)) |
|
224 |
endif |
|
225 |
endif |
|
226 |
||
227 |
ifneq ($$($1_PRECOMPILED_HEADER), ) |
|
228 |
ifeq ($$(filter $$(notdir $2), $$($1_PRECOMPILED_HEADER_EXCLUDE)), ) |
|
229 |
$1_$2_USE_PCH_FLAGS := $$($1_USE_PCH_FLAGS) |
|
230 |
endif |
|
231 |
endif |
|
232 |
||
20363 | 233 |
ifneq (,$$(filter %.c,$2)) |
234 |
# Compile as a C file |
|
37402 | 235 |
$1_$2_FLAGS=$(CFLAGS_CCACHE) $$($1_$2_USE_PCH_FLAGS) $4 \ |
236 |
$$($1_$(notdir $2)_OPT_CFLAGS) \ |
|
237 |
$$($1_$(notdir $2)_CFLAGS) $$($1_$2_THIS_FILE) -c |
|
20363 | 238 |
$1_$2_COMP=$5 |
239 |
$1_$2_DEP_FLAG:=$(C_FLAG_DEPS) |
|
240 |
else ifneq (,$$(filter %.m,$2)) |
|
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
241 |
# Compile as an Objective-C file |
37402 | 242 |
$1_$2_FLAGS=-x objective-c $(CFLAGS_CCACHE) $$($1_$2_USE_PCH_FLAGS) $4 \ |
243 |
$$($1_$(notdir $2)_OPT_CFLAGS) \ |
|
244 |
$$($1_$(notdir $2)_CFLAGS) $$($1_$2_THIS_FILE) -c |
|
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
245 |
$1_$2_COMP=$5 |
20363 | 246 |
$1_$2_DEP_FLAG:=$(C_FLAG_DEPS) |
35444 | 247 |
else ifneq (,$$(filter %.s %.S,$2)) |
20363 | 248 |
# Compile as assembler file |
35747 | 249 |
$1_$2_FLAGS=$8 |
20363 | 250 |
$1_$2_COMP=$(AS) |
251 |
$1_$2_DEP_FLAG:= |
|
32568 | 252 |
else ifneq (,$$(filter %.cpp,$2)$$(filter %.cc,$2)$$(filter %.mm,$2)) |
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
253 |
# Compile as a C++ or Objective-C++ file |
37402 | 254 |
$1_$2_FLAGS=$(CFLAGS_CCACHE) $$($1_$2_USE_PCH_FLAGS) $6 \ |
255 |
$$($1_$(notdir $2)_OPT_CXXFLAGS) \ |
|
256 |
$$($1_$(notdir $2)_CXXFLAGS) $$($1_$2_THIS_FILE) -c |
|
20363 | 257 |
$1_$2_COMP=$7 |
258 |
$1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS) |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
259 |
else |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
260 |
$$(error Internal error in NativeCompilation.gmk: no compiler for file $2) |
20363 | 261 |
endif |
262 |
# Generate the .o (.obj) file name and place it in the bin dir. |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
263 |
$1_$2_OBJ := $3/$$(call replace_with_obj_extension, $$(notdir $2)) |
20363 | 264 |
# Only continue if this object file hasn't been processed already. This lets the first found |
265 |
# source file override any other with the same name. |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
266 |
ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
267 |
$1_OBJS_SO_FAR+=$$($1_$2_OBJ) |
35444 | 268 |
ifeq (,$$(filter %.s %.S,$2)) |
20363 | 269 |
# And this is the dependency file for this obj file. |
270 |
$1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ)) |
|
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
271 |
# The dependency target file lists all dependencies as empty targets |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
272 |
# to avoid make error "No rule to make target" for removed files |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
273 |
$1_$2_DEP_TARGETS:=$$(patsubst %$(OBJ_SUFFIX),%.d.targets,$$($1_$2_OBJ)) |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
274 |
|
20363 | 275 |
# Include previously generated dependency information. (if it exists) |
276 |
-include $$($1_$2_DEP) |
|
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
277 |
-include $$($1_$2_DEP_TARGETS) |
20363 | 278 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
279 |
ifeq ($(TOOLCHAIN_TYPE), microsoft) |
36531
ef4e1ca50af8
8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents:
36052
diff
changeset
|
280 |
# To avoid name clashes between pdbs for objects and libs/execs, put |
ef4e1ca50af8
8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents:
36052
diff
changeset
|
281 |
# object pdbs in a separate subdir. |
ef4e1ca50af8
8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents:
36052
diff
changeset
|
282 |
$1_$2_DEBUG_OUT_FLAGS:=-Fd$$(strip $$(patsubst $$($1_OBJECT_DIR)/%, \ |
ef4e1ca50af8
8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents:
36052
diff
changeset
|
283 |
$$($1_OBJECT_DIR)/pdb/%, $$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)))) |
20363 | 284 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
285 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
286 |
|
37402 | 287 |
ifneq ($$(strip $$($1_$(notdir $2)_CFLAGS) $$($1_$(notdir $2)_CXXFLAGS) \ |
288 |
$$($1_$(notdir $2)_OPTIMIZATION)), ) |
|
289 |
$1_$2_VARDEPS := $$($1_$(notdir $2)_CFLAGS) $$($1_$(notdir $2)_CXXFLAGS) \ |
|
290 |
$$($1_$(notdir $2)_OPT_CFLAGS) $$($1_$(notdir $2)_OPT_CXXFLAGS) |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
291 |
$1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
292 |
$$(patsubst %$(OBJ_SUFFIX),%.vardeps,$$($1_$2_OBJ))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
293 |
endif |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
294 |
|
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
295 |
$$($1_$2_OBJ) : $2 $$($1_COMPILE_VARDEPS_FILE) $$($1_$2_VARDEPS_FILE) | $$($1_BUILD_INFO) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
296 |
$$(call LogInfo, Compiling $$(notdir $2) (for $$(notdir $$($1_TARGET)))) |
36531
ef4e1ca50af8
8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents:
36052
diff
changeset
|
297 |
$$(call MakeDir, $$(@D) $$(@D)/pdb) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
298 |
ifneq ($(TOOLCHAIN_TYPE), microsoft) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
299 |
ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s,$2), solstudio) |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
300 |
# The Solaris studio compiler doesn't output the full path to the object file in the |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
301 |
# generated deps files. Fixing it with sed. If compiling assembly, don't try this. |
35444 | 302 |
$$(call ExecuteWithLog, $$@, \ |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
303 |
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2) |
20363 | 304 |
$(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP) |
16988
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
305 |
else |
35444 | 306 |
$$(call ExecuteWithLog, $$@, \ |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
307 |
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2) |
20363 | 308 |
endif |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
309 |
# Create a dependency target file from the dependency file. |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
310 |
# Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
311 |
ifneq ($$($1_$2_DEP),) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
312 |
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_$2_DEP) > $$($1_$2_DEP_TARGETS) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32720
diff
changeset
|
313 |
endif |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
314 |
else |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
315 |
# The Visual Studio compiler lacks a feature for generating make dependencies, but by |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
316 |
# setting -showIncludes, all included files are printed. These are filtered out and |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
317 |
# parsed into make dependences. |
35008 | 318 |
# Keep as much as possible on one execution line for best performance on Windows. |
319 |
# No need to save exit code from compilation since pipefail is always active on |
|
320 |
# Windows. |
|
35444 | 321 |
$$(call ExecuteWithLog, $$@, \ |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
322 |
$$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \ |
35008 | 323 |
$(CC_OUT_OPTION)$$($1_$2_OBJ) $2) \ |
324 |
| $(GREP) -v -e "^Note: including file:" \ |
|
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
325 |
-e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \ |
35008 | 326 |
$(ECHO) $$@: \\ > $$($1_$2_DEP) ; \ |
327 |
$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_OBJ).log \ |
|
328 |
| $(SORT) -u >> $$($1_$2_DEP) ; \ |
|
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
329 |
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_$2_DEP) > $$($1_$2_DEP_TARGETS) |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
330 |
endif |
20363 | 331 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
332 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
333 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
334 |
# Setup make rules for creating a native binary (a shared library or an |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
335 |
# executable). |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
336 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
337 |
# Parameter 1 is the name of the rule. This name is used as variable prefix, |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
338 |
# and the targets generated are listed in a variable by that name. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
339 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
340 |
# Remaining parameters are named arguments. These include: |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
341 |
# TOOLCHAIN Name of toolchain setup to use. Defaults to TOOLCHAIN_DEFAULT. |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
342 |
# SRC one or more directory roots to scan for C/C++ files. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
343 |
# CFLAGS the compiler flags to be used, used both for C and C++. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
344 |
# CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
345 |
# LDFLAGS the linker flags to be used, used both for C and C++. |
33394 | 346 |
# LIBS the libraries to link to |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
347 |
# ARFLAGS the archiver flags to be used |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
348 |
# OBJECT_DIR the directory where we store the object files |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
349 |
# LIBRARY the resulting library file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
350 |
# PROGRAM the resulting exec file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
351 |
# INCLUDES only pick source from these directories |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
352 |
# EXCLUDES do not pick source from these directories |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
353 |
# INCLUDE_FILES only compile exactly these files! |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
354 |
# EXCLUDE_FILES with these names |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
355 |
# EXCLUDE_PATTERN exclude files matching any of these substrings |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
356 |
# EXTRA_FILES List of extra files not in any of the SRC dirs |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
357 |
# EXTRA_OBJECT_FILES List of extra object files to include when linking |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
358 |
# VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
359 |
# RC_FLAGS flags for RC. |
35747 | 360 |
# EMBED_MANIFEST if true, embed manifest on Windows. |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
361 |
# MAPFILE mapfile |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
362 |
# REORDER reorder file |
35747 | 363 |
# USE_MAPFILE_FOR_SYMBOLS if true and this is a STATIC_BUILD, just copy the |
364 |
# mapfile for the output symbols file |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
365 |
# CC the compiler to use, default is $(CC) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
366 |
# LD the linker to use, default is $(LD) |
37402 | 367 |
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST, HIGHEST_JVM, SIZE |
29304
81a723f8d33c
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29173
diff
changeset
|
368 |
# DISABLED_WARNINGS_<toolchain> Disable the given warnings for the specified toolchain |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
369 |
# DISABLED_WARNINGS_C_<toolchain> Disable the given warnings for the specified toolchain |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
370 |
# when compiling C code |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
371 |
# DISABLED_WARNINGS_CXX_<toolchain> Disable the given warnings for the specified |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
372 |
# toolchain when compiling C++ code |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
373 |
# STRIP_SYMBOLS Set to true to strip the final binary if the toolchain allows for it |
35444 | 374 |
# DEBUG_SYMBOLS Set to false to disable generation of debug symbols |
37402 | 375 |
# CFLAGS_DEBUG_SYMBOLS Overrides the default cflags for enabling debug symbols |
376 |
# CXXFLAGS_DEBUG_SYMBOLS Overrides the default cxxflags for enabling debug symbols |
|
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
377 |
# STRIPFLAGS Optionally change the flags given to the strip command |
37402 | 378 |
# PRECOMPILED_HEADER Header file to use as precompiled header |
379 |
# PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
380 |
SetupNativeCompilation = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
381 |
define SetupNativeCompilationBody |
13132 | 382 |
|
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
383 |
# If we're doing a static build and producing a library |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
384 |
# force it to be a static library and remove the -l libraries |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
385 |
ifeq ($(STATIC_BUILD), true) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
386 |
ifneq ($$($1_LIBRARY),) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
387 |
$1_STATIC_LIBRARY := $$($1_LIBRARY) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
388 |
$1_LIBRARY := |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
389 |
endif |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
390 |
endif |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
391 |
|
20363 | 392 |
ifneq (,$$($1_BIN)) |
393 |
$$(error BIN has been replaced with OBJECT_DIR) |
|
394 |
endif |
|
13132 | 395 |
|
20363 | 396 |
ifneq (,$$($1_LIB)) |
397 |
$$(error LIB has been replaced with LIBRARY) |
|
398 |
endif |
|
13132 | 399 |
|
20363 | 400 |
ifneq (,$$($1_EXE)) |
401 |
$$(error EXE has been replaced with PROGRAM) |
|
402 |
endif |
|
13132 | 403 |
|
20363 | 404 |
ifneq (,$$($1_LIBRARY)) |
405 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
406 |
$$(error LIBRARY requires OUTPUT_DIR) |
|
13132 | 407 |
endif |
408 |
||
20363 | 409 |
ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY))) |
410 |
$$(error directory of LIBRARY should be specified using OUTPUT_DIR) |
|
411 |
endif |
|
13132 | 412 |
|
20363 | 413 |
ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY))) |
414 |
$$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX)) |
|
415 |
endif |
|
13132 | 416 |
|
20363 | 417 |
ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY))) |
418 |
$$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX)) |
|
419 |
endif |
|
13132 | 420 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
421 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
422 |
$1_SUFFIX := $(SHARED_LIBRARY_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
423 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
424 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
425 |
$1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$$($1_SUFFIX) |
20363 | 426 |
$1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
427 |
$1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_LIBRARY) |
20363 | 428 |
endif |
429 |
||
430 |
ifneq (,$$($1_STATIC_LIBRARY)) |
|
431 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
432 |
$$(error STATIC_LIBRARY requires OUTPUT_DIR) |
|
13132 | 433 |
endif |
434 |
||
20363 | 435 |
ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY))) |
436 |
$$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR) |
|
437 |
endif |
|
13132 | 438 |
|
20363 | 439 |
ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY))) |
440 |
$$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX)) |
|
441 |
endif |
|
13132 | 442 |
|
20363 | 443 |
ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY))) |
444 |
$$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX)) |
|
13132 | 445 |
endif |
446 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
447 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
448 |
$1_SUFFIX := $(STATIC_LIBRARY_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
449 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
450 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
451 |
$1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$$($1_SUFFIX) |
20363 | 452 |
$1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
453 |
$1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY) |
20363 | 454 |
endif |
455 |
||
456 |
ifneq (,$$($1_PROGRAM)) |
|
457 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
458 |
$$(error PROGRAM requires OUTPUT_DIR) |
|
13132 | 459 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
460 |
|
20363 | 461 |
ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM))) |
462 |
$$(error directory of PROGRAM should be specified using OUTPUT_DIR) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
463 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
464 |
|
20363 | 465 |
ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM))) |
466 |
$$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX)) |
|
13132 | 467 |
endif |
468 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
469 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
470 |
$1_SUFFIX := $(EXE_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
471 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
472 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
473 |
$1_BASENAME:=$$($1_PROGRAM)$$($1_SUFFIX) |
20363 | 474 |
$1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
475 |
$1_NOSUFFIX:=$$($1_PROGRAM) |
20363 | 476 |
endif |
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
477 |
$1_SAFE_NAME := $$(strip $$(subst /,_, $1)) |
14111 | 478 |
|
20363 | 479 |
ifeq (,$$($1_TARGET)) |
480 |
$$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation) |
|
481 |
endif |
|
482 |
||
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
483 |
# Setup the toolchain to be used |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
484 |
$$(call SetIfEmpty, $1_TOOLCHAIN, TOOLCHAIN_DEFAULT) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
485 |
$$(call SetIfEmpty, $1_CC, $$($$($1_TOOLCHAIN)_CC)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
486 |
$$(call SetIfEmpty, $1_CXX, $$($$($1_TOOLCHAIN)_CXX)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
487 |
$$(call SetIfEmpty, $1_LD, $$($$($1_TOOLCHAIN)_LD)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
488 |
$$(call SetIfEmpty, $1_AR, $$($$($1_TOOLCHAIN)_AR)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
489 |
$$(call SetIfEmpty, $1_AS, $$($$($1_TOOLCHAIN)_AS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
490 |
$$(call SetIfEmpty, $1_MT, $$($$($1_TOOLCHAIN)_MT)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
491 |
$$(call SetIfEmpty, $1_RC, $$($$($1_TOOLCHAIN)_RC)) |
36506 | 492 |
$$(call SetIfEmpty, $1_OBJCOPY, $$($$($1_TOOLCHAIN)_OBJCOPY)) |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
493 |
$$(call SetIfEmpty, $1_STRIP, $$($$($1_TOOLCHAIN)_STRIP)) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
494 |
$$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$($$($1_TOOLCHAIN)_SYSROOT_CFLAGS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
495 |
$$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$($$($1_TOOLCHAIN)_SYSROOT_LDFLAGS)) |
20363 | 496 |
|
29862
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
497 |
ifneq ($$($1_MANIFEST), ) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
498 |
ifeq ($$($1_MANIFEST_VERSION), ) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
499 |
$$(error If MANIFEST is provided, then MANIFEST_VERSION is required in $1) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
500 |
endif |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
501 |
endif |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
502 |
|
20363 | 503 |
# Make sure the dirs exist. |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
504 |
$$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
505 |
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
506 |
$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
507 |
|
20363 | 508 |
# Find all files in the source trees. Sort to remove duplicates. |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
509 |
$1_SRCS := $$(sort $$(call CacheFind,$$($1_SRC))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
510 |
$1_SRCS := $$(filter $$(NATIVE_SOURCE_EXTENSIONS), $$($1_SRCS)) |
20363 | 511 |
# Extract the C/C++ files. |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
512 |
ifneq ($$($1_EXCLUDE_PATTERNS), ) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
513 |
# We must not match the exclude pattern against the src root(s). |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
514 |
$1_SRCS_WITHOUT_ROOTS := $$($1_SRCS) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
515 |
$$(foreach i,$$($1_SRC),$$(eval $1_SRCS_WITHOUT_ROOTS := $$(patsubst \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
516 |
$$i/%,%, $$($1_SRCS_WITHOUT_ROOTS)))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
517 |
$1_ALL_EXCLUDE_FILES := $$(call containing, $$($1_EXCLUDE_PATTERNS), \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
518 |
$$($1_SRCS_WITHOUT_ROOTS)) |
20363 | 519 |
endif |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
520 |
ifneq ($$($1_EXCLUDE_FILES),) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
521 |
$1_ALL_EXCLUDE_FILES += $$($1_EXCLUDE_FILES) |
20363 | 522 |
endif |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
523 |
ifneq ($$($1_ALL_EXCLUDE_FILES),) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
524 |
$1_EXCLUDE_FILES_PAT := $$($1_ALL_EXCLUDE_FILES) \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
525 |
$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_ALL_EXCLUDE_FILES))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
526 |
$1_EXCLUDE_FILES_PAT := $$(addprefix %,$$($1_EXCLUDE_FILES_PAT)) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
527 |
$1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PAT),$$($1_SRCS)) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
528 |
endif |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
529 |
ifneq ($$($1_INCLUDE_FILES), ) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
530 |
$1_INCLUDE_FILES_PAT := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
531 |
$1_SRCS := $$(filter $$($1_INCLUDE_FILES_PAT),$$($1_SRCS)) |
20363 | 532 |
endif |
533 |
# There can be only a single bin dir root, no need to foreach over the roots. |
|
534 |
$1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX)) |
|
535 |
# Now we have a list of all c/c++ files to compile: $$($1_SRCS) |
|
536 |
# and we have a list of all existing object files: $$($1_BINS) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
537 |
|
20363 | 538 |
# Prepend the source/bin path to the filter expressions. Then do the filtering. |
539 |
ifneq ($$($1_INCLUDES),) |
|
540 |
$1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) |
|
541 |
$1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS)) |
|
542 |
endif |
|
543 |
ifneq ($$($1_EXCLUDES),) |
|
25854 | 544 |
$1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES)) |
545 |
$1_SRC_EXCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
|
20363 | 546 |
$1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS)) |
547 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
548 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
549 |
$1_SRCS += $$($1_EXTRA_FILES) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
550 |
|
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
551 |
ifeq (,$$($1_SRCS)) |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
552 |
$$(error No sources found for $1 when looking inside the dirs $$($1_SRC)) |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
553 |
endif |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
554 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
555 |
# Calculate the expected output from compiling the sources |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
556 |
$1_EXPECTED_OBJS_FILENAMES := $$(call replace_with_obj_extension, $$(notdir $$($1_SRCS))) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
557 |
$1_EXPECTED_OBJS := $$(addprefix $$($1_OBJECT_DIR)/,$$($1_EXPECTED_OBJS_FILENAMES)) |
20363 | 558 |
# Are there too many object files on disk? Perhaps because some source file was removed? |
559 |
$1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS))) |
|
560 |
# Clean out the superfluous object files. |
|
561 |
ifneq ($$($1_SUPERFLUOUS_OBJS),) |
|
562 |
$$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) |
|
563 |
endif |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
564 |
# Sort to remove dupliates and provide a reproducable order on the input files to the linker. |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
565 |
$1_ALL_OBJS := $$(sort $$($1_EXPECTED_OBJS) $$($1_EXTRA_OBJECT_FILES)) |
20363 | 566 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
567 |
# Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables for CFLAGS. |
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
568 |
$1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) |
20363 | 569 |
ifneq ($(DEBUG_LEVEL),release) |
570 |
# Pickup extra debug dependent variables for CFLAGS |
|
571 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug) |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
572 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug) |
20363 | 573 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) |
574 |
else |
|
575 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_release) |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
576 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
20363 | 577 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) |
578 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
579 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
580 |
# Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS. |
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
581 |
$1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)) |
20363 | 582 |
ifneq ($(DEBUG_LEVEL),release) |
583 |
# Pickup extra debug dependent variables for CXXFLAGS |
|
584 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug) |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
585 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug) |
20363 | 586 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug) |
587 |
else |
|
588 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release) |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
589 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
20363 | 590 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) |
591 |
endif |
|
592 |
||
31015
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
593 |
# If no C++ flags are explicitly set, default to using the C flags. |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
594 |
# After that, we can set additional C++ flags that should not interfere |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
595 |
# with the mechanism for copying the C flags by default. |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
596 |
ifeq ($$($1_CXXFLAGS),) |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
597 |
$1_CXXFLAGS:=$$($1_CFLAGS) |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
598 |
endif |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
599 |
ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
600 |
$1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
601 |
endif |
babc2e8b3e97
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents:
30415
diff
changeset
|
602 |
|
35032 | 603 |
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
37402 | 604 |
$$(call SetIfEmpty, $1_CFLAGS_DEBUG_SYMBOLS, $(CFLAGS_DEBUG_SYMBOLS)) |
605 |
$$(call SetIfEmpty, $1_CXXFLAGS_DEBUG_SYMBOLS, $(CXXFLAGS_DEBUG_SYMBOLS)) |
|
606 |
$1_EXTRA_CFLAGS += $$($1_CFLAGS_DEBUG_SYMBOLS) |
|
607 |
$1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_DEBUG_SYMBOLS) |
|
20363 | 608 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
609 |
|
20363 | 610 |
ifneq (,$$($1_REORDER)) |
611 |
$1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) |
|
612 |
$1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) |
|
613 |
endif |
|
12801 | 614 |
|
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
615 |
# Pass the library name for static JNI library naming |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
616 |
ifneq ($$($1_STATIC_LIBRARY),) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
617 |
$1_EXTRA_CFLAGS += -DLIBRARY_NAME=$$($1_STATIC_LIBRARY) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
618 |
$1_EXTRA_CXXFLAGS += -DLIBRARY_NAME=$$($1_STATIC_LIBRARY) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
619 |
endif |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
620 |
|
29445
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
621 |
# Pick up disabled warnings, if possible on this platform. |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
622 |
ifneq ($(DISABLE_WARNING_PREFIX),) |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
623 |
$1_EXTRA_CFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), \ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
624 |
$$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)) \ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
625 |
$$($1_DISABLED_WARNINGS_C_$(TOOLCHAIN_TYPE))) |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
626 |
$1_EXTRA_CXXFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), \ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
627 |
$$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)) \ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33568
diff
changeset
|
628 |
$$($1_DISABLED_WARNINGS_CXX_$(TOOLCHAIN_TYPE))) |
29445
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
629 |
endif |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
630 |
|
30415 | 631 |
# Check if warnings should be considered errors. |
632 |
# Pick first binary and toolchain specific, then binary specific, then general setting. |
|
633 |
ifeq ($$($1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE)),) |
|
634 |
ifeq ($$($1_WARNINGS_AS_ERRORS),) |
|
635 |
$1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE) := $$(WARNINGS_AS_ERRORS) |
|
636 |
else |
|
637 |
$1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE) := $$($1_WARNINGS_AS_ERRORS) |
|
638 |
endif |
|
639 |
endif |
|
640 |
||
641 |
ifeq ($$($1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE)), true) |
|
642 |
$1_EXTRA_CFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS) |
|
643 |
$1_EXTRA_CXXFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS) |
|
644 |
endif |
|
645 |
||
20363 | 646 |
ifeq (NONE, $$($1_OPTIMIZATION)) |
37402 | 647 |
$1_OPT_CFLAGS := $(C_O_FLAG_NONE) |
648 |
$1_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE) |
|
20363 | 649 |
else ifeq (LOW, $$($1_OPTIMIZATION)) |
37402 | 650 |
$1_OPT_CFLAGS := $(C_O_FLAG_NORM) |
651 |
$1_OPT_CXXFLAGS := $(CXX_O_FLAG_NORM) |
|
20363 | 652 |
else ifeq (HIGH, $$($1_OPTIMIZATION)) |
37402 | 653 |
$1_OPT_CFLAGS := $(C_O_FLAG_HI) |
654 |
$1_OPT_CXXFLAGS := $(CXX_O_FLAG_HI) |
|
20363 | 655 |
else ifeq (HIGHEST, $$($1_OPTIMIZATION)) |
37402 | 656 |
$1_OPT_CFLAGS := $(C_O_FLAG_HIGHEST) |
657 |
$1_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST) |
|
658 |
else ifeq (HIGHEST_JVM, $$($1_OPTIMIZATION)) |
|
659 |
$1_OPT_CFLAGS := $(C_O_FLAG_HIGHEST_JVM) |
|
660 |
$1_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST_JVM) |
|
661 |
else ifeq (SIZE, $$($1_OPTIMIZATION)) |
|
662 |
$1_OPT_CFLAGS := $(C_O_FLAG_SIZE) |
|
663 |
$1_OPT_CXXFLAGS := $(CXX_O_FLAG_SIZE) |
|
20363 | 664 |
else ifneq (, $$($1_OPTIMIZATION)) |
665 |
$$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) |
|
666 |
endif |
|
13132 | 667 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
668 |
$1_BUILD_INFO := $$($1_OBJECT_DIR)/_build-info.marker |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
669 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
670 |
# Track variable changes for all variables that affect the compilation command |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
671 |
# lines for all object files in this setup. This includes at least all the |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
672 |
# variables used in the call to add_native_source below. |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
673 |
$1_COMPILE_VARDEPS := $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \ |
37402 | 674 |
$$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) $$($1_OPT_CFLAGS) $$($1_OPT_CXXFLAGS) \ |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
675 |
$$($1_CC) $$($1_CXX) $$($1_AS) $$($1_ASFLAGS) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
676 |
$1_COMPILE_VARDEPS_FILE := $$(call DependOnVariable, $1_COMPILE_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
677 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).comp.vardeps) |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22721
diff
changeset
|
678 |
|
37402 | 679 |
ifneq ($$($1_PRECOMPILED_HEADER), ) |
680 |
ifeq ($(USE_PRECOMPILED_HEADER), 1) |
|
681 |
ifeq ($(TOOLCHAIN_TYPE), microsoft) |
|
682 |
$1_PCH_FILE := $$($1_OBJECT_DIR)/$1.pch |
|
683 |
$1_GENERATED_PCH_SRC := $$($1_OBJECT_DIR)/$1_pch.cpp |
|
684 |
$1_GENERATED_PCH_OBJ := $$($1_OBJECT_DIR)/$1_pch.obj |
|
685 |
||
686 |
$$(eval $$(call add_native_source,$1,$$($1_GENERATED_PCH_SRC), \ |
|
687 |
$$($1_OBJECT_DIR),,, \ |
|
688 |
$$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) $$($1_SYSROOT_CFLAGS) \ |
|
689 |
-Fp$$($1_PCH_FILE) -Yc$$(notdir $$($1_PRECOMPILED_HEADER)), \ |
|
690 |
$$($1_CXX),,no_this_file)) |
|
691 |
||
692 |
$1_USE_PCH_FLAGS := \ |
|
693 |
-Fp$$($1_PCH_FILE) -Yu$$(notdir $$($1_PRECOMPILED_HEADER)) |
|
694 |
||
695 |
$$($1_ALL_OBJS): $$($1_GENERATED_PCH_OBJ) |
|
696 |
||
697 |
# Explicitly add the pch obj file first to ease comparing to old |
|
698 |
# hotspot build. |
|
699 |
$1_ALL_OBJS := $$($1_GENERATED_PCH_OBJ) $$($1_ALL_OBJS) |
|
700 |
||
701 |
$$($1_GENERATED_PCH_SRC): |
|
702 |
$(ECHO) "#include \"$$(notdir $$($1_PRECOMPILED_HEADER))\"" > $$@ |
|
703 |
||
704 |
else ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), ) |
|
705 |
ifeq ($(TOOLCHAIN_TYPE), gcc) |
|
706 |
$1_PCH_FILE := $$($1_OBJECT_DIR)/precompiled/$$(notdir $$($1_PRECOMPILED_HEADER)).gch |
|
707 |
$1_USE_PCH_FLAGS := -I$$($1_OBJECT_DIR)/precompiled |
|
708 |
else ifeq ($(TOOLCHAIN_TYPE), clang) |
|
709 |
$1_PCH_FILE := $$($1_OBJECT_DIR)/precompiled/$$(notdir $$($1_PRECOMPILED_HEADER)).pch |
|
710 |
$1_USE_PCH_FLAGS := -include-pch $$($1_PCH_FILE) |
|
711 |
endif |
|
712 |
$1_PCH_DEP := $$($1_PCH_FILE).d |
|
713 |
$1_PCH_DEP_TARGETS := $$($1_PCH_FILE).d.targets |
|
714 |
||
715 |
-include $$($1_PCH_DEP) |
|
716 |
-include $$($1_PCH_DEP_TARGETS) |
|
717 |
||
718 |
$$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE) |
|
719 |
$$(call LogInfo, Generating precompiled header) |
|
720 |
$$(call MakeDir, $$(@D)) |
|
721 |
$$(call ExecuteWithLog, $$@, \ |
|
722 |
$$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \ |
|
723 |
$$($1_OPT_CFLAGS) \ |
|
724 |
-x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP) $$< -o $$@) |
|
725 |
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEP) > $$($1_PCH_DEP_TARGETS) |
|
726 |
||
727 |
$$($1_ALL_OBJS): $$($1_PCH_FILE) |
|
728 |
||
729 |
endif |
|
730 |
endif |
|
731 |
endif |
|
732 |
||
20363 | 733 |
# Now call add_native_source for each source file we are going to compile. |
734 |
$$(foreach p,$$($1_SRCS), \ |
|
735 |
$$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
736 |
$$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS), \ |
28355 | 737 |
$$($1_CC), \ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
738 |
$$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) $$($1_SYSROOT_CFLAGS), \ |
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
739 |
$$($1_CXX), $$($1_ASFLAGS)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
740 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
741 |
# Setup rule for printing progress info when compiling source files. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
742 |
# This is a rough heuristic and may not always print accurate information. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
743 |
$$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
744 |
ifeq ($$(wildcard $$($1_TARGET)),) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
745 |
$(ECHO) 'Creating $$($1_BASENAME) from $$(words $$(filter-out %.vardeps, $$?)) file(s)' |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
746 |
else |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
747 |
$(ECHO) $$(strip 'Updating $$($1_BASENAME)' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
748 |
$$(if $$(filter-out %.vardeps, $$?), \ |
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
749 |
'due to $$(words $$(filter-out %.vardeps, $$?)) file(s)', \ |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32568
diff
changeset
|
750 |
$$(if $$(filter %.vardeps, $$?), 'due to makefile changes'))) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
751 |
endif |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
752 |
$(TOUCH) $$@ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
753 |
|
20363 | 754 |
# On windows we need to create a resource file |
755 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
756 |
ifneq (,$$($1_VERSIONINFO_RESOURCE)) |
|
757 |
$1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
758 |
$1_RES_DEP:=$$($1_RES).d |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
759 |
$1_RES_DEP_TARGETS:=$$($1_RES).d.targets |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
760 |
-include $$($1_RES_DEP) |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
761 |
-include $$($1_RES_DEP_TARGETS) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
762 |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
763 |
$1_RES_VARDEPS := $$($1_RC) $$($1_RC_FLAGS) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
764 |
$1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
765 |
$$($1_RES).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
766 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
767 |
$$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE) |
35008 | 768 |
$$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET)))) |
36050
f6590b6e5e97
8150203: Incremental update from build-infra project
ihse
parents:
35747
diff
changeset
|
769 |
$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR)) |
35747 | 770 |
$$(call ExecuteWithLog, $$@, \ |
771 |
$$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \ |
|
772 |
$$($1_VERSIONINFO_RESOURCE)) |
|
37867
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
773 |
# Windows RC compiler does not support -showIncludes, so we mis-use CL |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
774 |
# for this. Filter out RC specific arguments that are unknown to CL. |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
775 |
# For some unknown reason, in this case CL actually outputs the show |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
776 |
# includes to stderr so need to redirect it to hide the output from the |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
777 |
# main log. |
36050
f6590b6e5e97
8150203: Incremental update from build-infra project
ihse
parents:
35747
diff
changeset
|
778 |
$$(call ExecuteWithLog, $$($1_RES_DEP).obj, \ |
37867
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
779 |
$$($1_CC) $$(filter-out -l%, $$($1_RC_FLAGS)) \ |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
780 |
$$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \ |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
781 |
$(CC_OUT_OPTION)$$($1_RES_DEP).obj -P -Fi$$($1_RES_DEP).pp \ |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
782 |
$$($1_VERSIONINFO_RESOURCE)) 2>&1 \ |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
783 |
| $(GREP) -v -e "^Note: including file:" \ |
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
784 |
-e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \ |
35008 | 785 |
$(ECHO) $$($1_RES): \\ > $$($1_RES_DEP) ; \ |
37867
379a6c51a588
8156837: RC resource compilation on windows generates false build failure reports
erikj
parents:
37402
diff
changeset
|
786 |
$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).obj.log >> $$($1_RES_DEP) ; \ |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
787 |
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS) |
20363 | 788 |
endif |
789 |
endif |
|
12801 | 790 |
|
35747 | 791 |
ifneq ($(DISABLE_MAPFILES),true) |
792 |
$1_REAL_MAPFILE := $$($1_MAPFILE) |
|
13132 | 793 |
ifneq ($(OPENJDK_TARGET_OS),windows) |
20363 | 794 |
ifneq (,$$($1_REORDER)) |
35747 | 795 |
$1_REAL_MAPFILE := $$($1_OBJECT_DIR)/mapfile |
12801 | 796 |
|
20363 | 797 |
$$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER) |
36050
f6590b6e5e97
8150203: Incremental update from build-infra project
ihse
parents:
35747
diff
changeset
|
798 |
$$(call MakeDir, $$(@D)) |
12801 | 799 |
$$(CP) $$($1_MAPFILE) $$@.tmp |
13132 | 800 |
$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp |
12801 | 801 |
$$(MV) $$@.tmp $$@ |
20363 | 802 |
endif |
12801 | 803 |
endif |
20363 | 804 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
805 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
806 |
# Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables |
33394 | 807 |
# for LDFLAGS and LIBS |
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
808 |
$1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) |
33394 | 809 |
$1_EXTRA_LIBS:=$$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) |
20363 | 810 |
ifneq (,$$($1_REAL_MAPFILE)) |
811 |
$1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) |
|
812 |
endif |
|
813 |
||
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
814 |
# Need to make sure TARGET is first on list |
20363 | 815 |
$1 := $$($1_TARGET) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
816 |
|
35444 | 817 |
ifeq ($(COPY_DEBUG_SYMBOLS), true) |
818 |
ifneq ($$($1_DEBUG_SYMBOLS), false) |
|
819 |
# Only copy debug symbols for dynamic libraries and programs. |
|
820 |
ifeq ($$($1_STATIC_LIBRARY), ) |
|
821 |
ifneq ($$($1_OUTPUT_DIR), $$($1_OBJECT_DIR)) |
|
822 |
# The dependency on TARGET is needed on windows for debuginfo files |
|
823 |
# to be rebuilt properly. |
|
824 |
$$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% $$($1_TARGET) |
|
35747 | 825 |
# Use cp -r since on macosx, the dSYM is a directory |
826 |
$(CP) -r $$< $$@ |
|
35444 | 827 |
endif |
828 |
||
829 |
# Generate debuginfo files. |
|
830 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
36531
ef4e1ca50af8
8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents:
36052
diff
changeset
|
831 |
$1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \ |
35444 | 832 |
"-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map" |
833 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \ |
|
834 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map |
|
835 |
# No separate command is needed for debuginfo on windows, instead |
|
836 |
# touch target to make sure it has a later time stamp than the debug |
|
837 |
# symbol files to avoid unnecessary relinking on rebuild. |
|
838 |
$1_CREATE_DEBUGINFO_CMDS := $(TOUCH) $$($1_TARGET) |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
839 |
|
35444 | 840 |
else ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) |
841 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo |
|
842 |
# Setup the command line creating debuginfo files, to be run after linking. |
|
843 |
# It cannot be run separately since it updates the original target file |
|
844 |
$1_CREATE_DEBUGINFO_CMDS := \ |
|
36506 | 845 |
$$($1_OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \ |
846 |
$(CD) $$($1_OUTPUT_DIR) && \ |
|
847 |
$$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET) |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
848 |
|
35444 | 849 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
850 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM |
|
851 |
# On Macosx, the debuginfo generation doesn't touch the linked binary, but |
|
852 |
# to avoid always relinking, touch it anyway to force a later timestamp than |
|
853 |
# the dSYM files. |
|
854 |
$1_CREATE_DEBUGINFO_CMDS := \ |
|
855 |
$(DSYMUTIL) --out $$($1_DEBUGINFO_FILES) $$($1_TARGET) $$(NEWLINE) \ |
|
856 |
$(TOUCH) $$($1_TARGET) |
|
857 |
endif # OPENJDK_TARGET_OS |
|
27560 | 858 |
|
35444 | 859 |
# This dependency dance ensures that debug info files get rebuilt |
860 |
# properly if deleted. |
|
861 |
$$($1_TARGET): $$($1_DEBUGINFO_FILES) |
|
862 |
$$($1_DEBUGINFO_FILES): $$($1_ALL_OBJS) |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
863 |
|
35444 | 864 |
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true) |
865 |
$1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz |
|
866 |
$1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP)) |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
867 |
|
35444 | 868 |
# The dependency on TARGET is needed for debuginfo files |
869 |
# to be rebuilt properly. |
|
870 |
$$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET) |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
871 |
$(CD) $$($1_OBJECT_DIR) \ |
35032 | 872 |
&& $(ZIP) -q -r $$@ $$(notdir $$($1_DEBUGINFO_FILES)) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
873 |
|
35444 | 874 |
else |
875 |
$1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES)) |
|
876 |
endif |
|
877 |
endif # !STATIC_LIBRARY |
|
878 |
endif # $1_DEBUG_SYMBOLS != false |
|
35032 | 879 |
endif # COPY_DEBUG_SYMBOLS |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
880 |
|
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
881 |
ifeq ($$($1_STRIP_SYMBOLS), true) |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
882 |
ifneq ($$($1_STRIP), ) |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
883 |
# Default to using the global STRIPFLAGS. Allow for overriding with an empty value |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
884 |
$1_STRIPFLAGS ?= $(STRIPFLAGS) |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
885 |
$1_STRIP_CMD := $$($1_STRIP) $$($1_STRIPFLAGS) $$($1_TARGET) |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
886 |
endif |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
887 |
endif |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
888 |
|
20363 | 889 |
ifneq (,$$($1_LIBRARY)) |
890 |
# Generating a dynamic library. |
|
27560 | 891 |
$1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME)) |
20363 | 892 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
27560 | 893 |
$1_EXTRA_LDFLAGS += "-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" |
12801 | 894 |
endif |
895 |
||
36051 | 896 |
# Create loadmap on AIX. Helps in diagnosing some problems. |
897 |
ifneq ($(COMPILER_BINDCMD_FILE_FLAG),) |
|
898 |
$1_EXTRA_LDFLAGS += $(COMPILER_BINDCMD_FILE_FLAG)$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).loadmap |
|
899 |
endif |
|
900 |
||
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
901 |
$1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
33394 | 902 |
$$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_CREATE_DEBUGINFO_CMDS) \ |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
903 |
$$($1_STRIP_CMD) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
904 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
905 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
906 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
907 |
$1_LD_OBJ_ARG := $$($1_ALL_OBJS) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
908 |
|
34864
47326b00e368
8146638: Only use compiler option files if they are really supported by the toolchain
simonis
parents:
34596
diff
changeset
|
909 |
# If there are many object files, use an @-file... |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
910 |
ifneq ($$(word 17, $$($1_ALL_OBJS)), ) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
911 |
$1_OBJ_FILE_LIST := $$($1_OBJECT_DIR)/_$1_objectfilenames.txt |
34864
47326b00e368
8146638: Only use compiler option files if they are really supported by the toolchain
simonis
parents:
34596
diff
changeset
|
912 |
ifneq ($(COMPILER_COMMAND_FILE_FLAG),) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
913 |
$1_LD_OBJ_ARG := $(COMPILER_COMMAND_FILE_FLAG)$$($1_OBJ_FILE_LIST) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
914 |
else |
34864
47326b00e368
8146638: Only use compiler option files if they are really supported by the toolchain
simonis
parents:
34596
diff
changeset
|
915 |
# ...except for toolchains which don't support them. |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
916 |
$1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)` |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
917 |
endif |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
918 |
endif |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
919 |
|
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
920 |
$$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \ |
32462
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
32344
diff
changeset
|
921 |
$$($1_VARDEPS_FILE) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
922 |
ifneq ($$($1_OBJ_FILE_LIST), ) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
923 |
$$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST))) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
924 |
endif |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
925 |
# Keep as much as possible on one execution line for best performance |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
926 |
# on Windows |
35008 | 927 |
$$(call LogInfo, Linking $$($1_BASENAME)) |
35370
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
928 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
35444 | 929 |
$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
35370
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
930 |
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
931 |
$(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$($1_LIBS) \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
932 |
$$($1_EXTRA_LIBS)) \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
933 |
| $(GREP) -v "^ Creating library .*\.lib and object .*\.exp" || \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
934 |
test "$$$$?" = "1" ; \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
935 |
$$($1_CREATE_DEBUGINFO_CMDS) |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
936 |
$$($1_STRIP_CMD) |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
937 |
else |
35444 | 938 |
$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
35370
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
939 |
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
940 |
$(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$($1_LIBS) \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
941 |
$$($1_EXTRA_LIBS)) ; \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
942 |
$$($1_CREATE_DEBUGINFO_CMDS) |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
943 |
$$($1_STRIP_CMD) |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35032
diff
changeset
|
944 |
endif |
13132 | 945 |
|
20363 | 946 |
endif |
13132 | 947 |
|
20363 | 948 |
ifneq (,$$($1_STATIC_LIBRARY)) |
33394 | 949 |
$1_VARDEPS := $$($1_AR) $$($1_ARFLAGS) $$($1_LIBS) \ |
950 |
$$($1_EXTRA_LIBS) |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
951 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
952 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
953 |
|
20363 | 954 |
# Generating a static library, ie object file archive. |
35747 | 955 |
ifeq ($(STATIC_BUILD), true) |
956 |
ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true) |
|
957 |
STATIC_MAPFILE_DEP := $$($1_MAPFILE) |
|
958 |
endif |
|
959 |
endif |
|
960 |
||
961 |
$$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE) $$(STATIC_MAPFILE_DEP) |
|
35008 | 962 |
$$(call LogInfo, Archiving $$($1_STATIC_LIBRARY)) |
35444 | 963 |
$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
964 |
$$($1_AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_ALL_OBJS) \ |
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
965 |
$$($1_RES)) |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
966 |
ifeq ($(STATIC_BUILD), true) |
35747 | 967 |
ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true) |
968 |
$(CP) $$($1_MAPFILE) $$(@D)/$$(basename $$(@F)).symbols |
|
969 |
else |
|
970 |
$(GetSymbols) |
|
971 |
endif |
|
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32812
diff
changeset
|
972 |
endif |
20363 | 973 |
endif |
13132 | 974 |
|
20363 | 975 |
ifneq (,$$($1_PROGRAM)) |
976 |
# A executable binary has been specified, setup the target for it. |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
977 |
$1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
33394 | 978 |
$$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \ |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
979 |
$$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \ |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
980 |
$$($1_STRIP_CMD) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
981 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
982 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
983 |
|
35747 | 984 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
985 |
ifeq ($$($1_EMBED_MANIFEST), true) |
|
986 |
$1_EXTRA_LDFLAGS += -manifest:embed |
|
987 |
endif |
|
988 |
endif |
|
989 |
||
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
990 |
$$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \ |
32462
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
32344
diff
changeset
|
991 |
$$($1_VARDEPS_FILE) |
35008 | 992 |
$$(call LogInfo, Linking executable $$($1_BASENAME)) |
35444 | 993 |
$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
994 |
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31015
diff
changeset
|
995 |
$(EXE_OUT_OPTION)$$($1_TARGET) \ |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34493
diff
changeset
|
996 |
$$($1_ALL_OBJS) $$($1_RES) \ |
33394 | 997 |
$$($1_LIBS) $$($1_EXTRA_LIBS)) |
29862
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
998 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
999 |
ifneq ($$($1_MANIFEST), ) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
1000 |
$$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_PROGRAM).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1 |
29862
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
1001 |
endif |
27560 | 1002 |
endif |
1003 |
# This only works if the openjdk_codesign identity is present on the system. Let |
|
1004 |
# silently fail otherwise. |
|
1005 |
ifneq (,$(CODESIGN)) |
|
1006 |
ifneq (,$$($1_CODESIGN)) |
|
1007 |
$(CODESIGN) -s openjdk_codesign $$@ |
|
1008 |
endif |
|
1009 |
endif |
|
1010 |
$$($1_CREATE_DEBUGINFO_CMDS) |
|
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32568
diff
changeset
|
1011 |
$$($1_STRIP_CMD) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
1012 |
|
20363 | 1013 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1014 |
endef |
25854 | 1015 |
|
1016 |
endif # _NATIVE_COMPILATION_GMK |