author | attila |
Tue, 05 May 2015 18:35:29 +0200 | |
changeset 30390 | 357f9a3f9394 |
parent 29866 | 6cecef2d84ab |
child 30415 | c5629d65265d |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, 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 |
################################################################################ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
38 |
# Define a native toolchain configuration that can be used by |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
39 |
# SetupNativeCompilation calls |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
40 |
# |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
41 |
# Parameter 1 is the name of the toolchain definition |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
42 |
# |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
43 |
# Remaining parameters are named arguments: |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
44 |
# EXTENDS - Optional parent definition to get defaults from |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
45 |
# CC - The C compiler |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
46 |
# CXX - The C++ compiler |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
47 |
# LD - The Linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
48 |
# AR - Static linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
49 |
# AS - Assembler |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
50 |
# MT - Windows MT tool |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
51 |
# RC - Windows RC tool |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
52 |
# SYSROOT_CFLAGS - Compiler flags for using the specific sysroot |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
53 |
# SYSROOT_LDFLAGS - Linker flags for using the specific sysroot |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
54 |
DefineNativeToolchain = $(NamedParamsMacroTemplate) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
55 |
define DefineNativeToolchainBody |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
56 |
# If extending another definition, get default values from that, |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
57 |
# otherwise, nothing more needs to be done as variable assignments |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
58 |
# already happened in NamedParamsMacroTemplate. |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
59 |
ifneq ($$($1_EXTENDS), ) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
60 |
$$(call SetIfEmpty, $1_CC, $$($$($1_EXTENDS)_CC)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
61 |
$$(call SetIfEmpty, $1_CXX, $$($$($1_EXTENDS)_CXX)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
62 |
$$(call SetIfEmpty, $1_LD, $$($$($1_EXTENDS)_LD)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
63 |
$$(call SetIfEmpty, $1_AR, $$($$($1_EXTENDS)_AR)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
64 |
$$(call SetIfEmpty, $1_AS, $$($$($1_EXTENDS)_AS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
65 |
$$(call SetIfEmpty, $1_MT, $$($$($1_EXTENDS)_MT)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
66 |
$$(call SetIfEmpty, $1_RC, $$($$($1_EXTENDS)_RC)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
67 |
$$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$($$($1_EXTENDS)_SYSROOT_CFLAGS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
68 |
$$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$($$($1_EXTENDS)_SYSROOT_LDFLAGS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
69 |
endif |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
70 |
endef |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
71 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
72 |
# Create a default toolchain with the main compiler and linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
73 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_DEFAULT, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
74 |
CC := $(CC), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
75 |
CXX := $(CXX), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
76 |
LD := $(LD), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
77 |
AR := $(AR), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
78 |
AS := $(AS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
79 |
MT := $(MT), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
80 |
RC := $(RC), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
81 |
SYSROOT_CFLAGS := $(SYSROOT_CFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
82 |
SYSROOT_LDFLAGS := $(SYSROOT_LDFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
83 |
)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
84 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
85 |
# Create a toolchain where linking is done with the C++ linker |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
86 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_LINK_CXX, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
87 |
EXTENDS := TOOLCHAIN_DEFAULT, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
88 |
LD := $(LDCXX), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
89 |
)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
90 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
91 |
# 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
|
92 |
# are to be run during the build. |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
93 |
# The BUILD_SYSROOT_*FLAGS variables are empty for now. |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
94 |
$(eval $(call DefineNativeToolchain, TOOLCHAIN_BUILD, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
95 |
EXTENDS := TOOLCHAIN_DEFAULT, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
96 |
CC := $(BUILD_CC), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
97 |
LD := $(BUILD_LD), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
98 |
SYSROOT_CFLAGS := $(BUILD_SYSROOT_CFLAGS), \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
99 |
SYSROOT_LDFLAGS := $(BUILD_SYSROOT_LDFLAGS), \ |
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 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
102 |
################################################################################ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
103 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
104 |
# Extensions of files handled by this macro. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
105 |
NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
106 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
107 |
# Replaces native source extensions with the object file extension in a string. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
108 |
# Param 1: the string containing source file names with extensions |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
109 |
# The surrounding strip is needed to keep additional whitespace out |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
110 |
define replace_with_obj_extension |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
111 |
$(strip \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
112 |
$(foreach extension, $(NATIVE_SOURCE_EXTENSIONS), \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
113 |
$(patsubst $(extension),%$(OBJ_SUFFIX),$(filter $(extension),$1))) \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
114 |
) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
115 |
endef |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
116 |
|
25882 | 117 |
ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin) |
118 |
UNIX_PATH_PREFIX := /cygdrive |
|
119 |
else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys) |
|
120 |
UNIX_PATH_PREFIX := |
|
121 |
endif |
|
122 |
||
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
123 |
# 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
|
124 |
# into a make syntax dependency file (.d) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
125 |
WINDOWS_SHOWINCLUDE_SED_PATTERN := \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
126 |
-e '/^Note: including file:/!d' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
127 |
-e 's|Note: including file: *||' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
128 |
-e 's|\\|/|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
129 |
-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
|
130 |
-e '\|$(TOPDIR)|I !d' \ |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
131 |
-e 's|$$$$| \\|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
132 |
# |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
133 |
|
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
134 |
# 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
|
135 |
# of make targets for dependent files (.d.targets) |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
136 |
DEPENDENCY_TARGET_SED_PATTERN := \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
137 |
-e 's/\#.*//' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
138 |
-e 's/^[^:]*: *//' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
139 |
-e 's/ *\\$$$$//' \ |
29850
06864caf80e2
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29445
diff
changeset
|
140 |
-e 's/^[ ]*//' \ |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
141 |
-e '/^$$$$/ d' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
142 |
-e 's/$$$$/ :/' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
143 |
# |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
144 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
145 |
define add_native_source |
20363 | 146 |
# param 1 = BUILD_MYPACKAGE |
147 |
# parma 2 = the source file name (..../alfa.c or .../beta.cpp) |
|
148 |
# param 3 = the bin dir that stores all .o (.obj) and .d files. |
|
149 |
# param 4 = the c flags to the compiler |
|
150 |
# param 5 = the c compiler |
|
151 |
# param 6 = the c++ flags to the compiler |
|
152 |
# param 7 = the c++ compiler |
|
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
153 |
# param 8 = the flags to the assembler |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
154 |
|
20363 | 155 |
ifneq (,$$(filter %.c,$2)) |
156 |
# Compile as a C file |
|
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
28810
diff
changeset
|
157 |
$1_$2_FLAGS=$(CFLAGS_CCACHE) $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c |
20363 | 158 |
$1_$2_COMP=$5 |
159 |
$1_$2_DEP_FLAG:=$(C_FLAG_DEPS) |
|
160 |
else ifneq (,$$(filter %.m,$2)) |
|
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
161 |
# Compile as an Objective-C file |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
28810
diff
changeset
|
162 |
$1_$2_FLAGS=-x objective-c $(CFLAGS_CCACHE) $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c |
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
163 |
$1_$2_COMP=$5 |
20363 | 164 |
$1_$2_DEP_FLAG:=$(C_FLAG_DEPS) |
165 |
else ifneq (,$$(filter %.s,$2)) |
|
166 |
# Compile as assembler file |
|
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
167 |
$1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"' |
20363 | 168 |
$1_$2_COMP=$(AS) |
169 |
$1_$2_DEP_FLAG:= |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
170 |
else ifneq (,$$(filter %.cpp,$2)$$(filter %.mm,$2)) |
29173
ad065cf432e9
8074099: Even with toolchain type clang, OBJC is set to gcc
ihse
parents:
28909
diff
changeset
|
171 |
# Compile as a C++ or Objective-C++ file |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
28810
diff
changeset
|
172 |
$1_$2_FLAGS=$(CFLAGS_CCACHE) $6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c |
20363 | 173 |
$1_$2_COMP=$7 |
174 |
$1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS) |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
175 |
else |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
176 |
$$(error Internal error in NativeCompilation.gmk: no compiler for file $2) |
20363 | 177 |
endif |
178 |
# 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
|
179 |
$1_$2_OBJ := $3/$$(call replace_with_obj_extension, $$(notdir $2)) |
20363 | 180 |
# Only continue if this object file hasn't been processed already. This lets the first found |
181 |
# source file override any other with the same name. |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
182 |
ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_ALL_OBJS))) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
183 |
$1_ALL_OBJS+=$$($1_$2_OBJ) |
20363 | 184 |
ifeq (,$$(filter %.s,$2)) |
185 |
# And this is the dependency file for this obj file. |
|
186 |
$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
|
187 |
# The dependency target file lists all dependencies as empty targets |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
188 |
# 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
|
189 |
$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
|
190 |
|
20363 | 191 |
# Include previously generated dependency information. (if it exists) |
192 |
-include $$($1_$2_DEP) |
|
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
193 |
-include $$($1_$2_DEP_TARGETS) |
20363 | 194 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
195 |
ifeq ($(TOOLCHAIN_TYPE), microsoft) |
20363 | 196 |
$1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \ |
197 |
-Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ)) |
|
198 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
199 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
200 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
201 |
$$($1_$2_OBJ) : $2 $$($1_COMPILE_VARDEPS_FILE) | $$($1_BUILD_INFO) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
202 |
$(ECHO) $(LOG_INFO) "Compiling $$(notdir $2) (for $$(notdir $$($1_TARGET)))" |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
203 |
ifneq ($(TOOLCHAIN_TYPE), microsoft) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
204 |
# The Solaris studio compiler doesn't output the full path to the object file in the |
16988
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
205 |
# generated deps files. Fixing it with sed. If compiling assembly, don't try this. |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
206 |
ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s,$2), solstudio) |
20363 | 207 |
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 |
208 |
$(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
|
209 |
else |
20363 | 210 |
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 |
211 |
endif |
|
16988
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
212 |
endif |
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
213 |
# The Visual Studio compiler lacks a feature for generating make dependencies, but by |
20363 | 214 |
# setting -showIncludes, all included files are printed. These are filtered out and |
16988
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
215 |
# parsed into make dependences. |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
216 |
ifeq ($(TOOLCHAIN_TYPE), microsoft) |
20363 | 217 |
($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \ |
218 |
$(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \ |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
219 |
| $(TEE) $$($1_$2_DEP).raw | $(GREP) -v -e "^Note: including file:" \ |
28602
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27602
diff
changeset
|
220 |
-e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \ |
51c0dcf51b67
8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents:
27602
diff
changeset
|
221 |
exit `cat $$($1_$2_DEP).exitvalue` |
20363 | 222 |
$(RM) $$($1_$2_DEP).exitvalue |
223 |
($(ECHO) $$@: \\ \ |
|
29436
91f4e8a8134f
8075054: Mixed case Windows path break native dependency checks
ihse
parents:
29312
diff
changeset
|
224 |
&& $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) | $(SORT) -u > $$($1_$2_DEP) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
225 |
endif |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
226 |
# Create a dependency target file from the dependency file. |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
227 |
# Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
228 |
ifneq ($$($1_$2_DEP),) |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
229 |
$(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
|
230 |
endif |
20363 | 231 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
232 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
233 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
234 |
# 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
|
235 |
# executable). |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
236 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
237 |
# 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
|
238 |
# 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
|
239 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
240 |
# Remaining parameters are named arguments. These include: |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
241 |
# 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
|
242 |
# 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
|
243 |
# 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
|
244 |
# 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
|
245 |
# LDFLAGS the linker flags to be used, used both for C and C++. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
246 |
# LDFLAGS_SUFFIX the linker flags to be added last on the commandline |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
247 |
# typically the libraries linked to. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
248 |
# ARFLAGS the archiver flags to be used |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
249 |
# OBJECT_DIR the directory where we store the object files |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
250 |
# LIBRARY the resulting library file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
251 |
# PROGRAM the resulting exec file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
252 |
# INCLUDES only pick source from these directories |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
253 |
# EXCLUDES do not pick source from these directories |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
254 |
# INCLUDE_FILES only compile exactly these files! |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
255 |
# EXCLUDE_FILES with these names |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
256 |
# EXTRA_FILES List of extra files not in any of the SRC dirs |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
257 |
# 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
|
258 |
# RC_FLAGS flags for RC. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
259 |
# MAPFILE mapfile |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
260 |
# REORDER reorder file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
261 |
# DEBUG_SYMBOLS add debug symbols (if configured on) |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
262 |
# CC the compiler to use, default is $(CC) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
263 |
# LD the linker to use, default is $(LD) |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
264 |
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST |
29304
81a723f8d33c
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29173
diff
changeset
|
265 |
# DISABLED_WARNINGS_<toolchain> Disable the given warnings for the specified toolchain |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
266 |
SetupNativeCompilation = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
267 |
define SetupNativeCompilationBody |
13132 | 268 |
|
20363 | 269 |
ifneq (,$$($1_BIN)) |
270 |
$$(error BIN has been replaced with OBJECT_DIR) |
|
271 |
endif |
|
13132 | 272 |
|
20363 | 273 |
ifneq (,$$($1_LIB)) |
274 |
$$(error LIB has been replaced with LIBRARY) |
|
275 |
endif |
|
13132 | 276 |
|
20363 | 277 |
ifneq (,$$($1_EXE)) |
278 |
$$(error EXE has been replaced with PROGRAM) |
|
279 |
endif |
|
13132 | 280 |
|
20363 | 281 |
ifneq (,$$($1_LIBRARY)) |
282 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
283 |
$$(error LIBRARY requires OUTPUT_DIR) |
|
13132 | 284 |
endif |
285 |
||
20363 | 286 |
ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY))) |
287 |
$$(error directory of LIBRARY should be specified using OUTPUT_DIR) |
|
288 |
endif |
|
13132 | 289 |
|
20363 | 290 |
ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY))) |
291 |
$$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX)) |
|
292 |
endif |
|
13132 | 293 |
|
20363 | 294 |
ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY))) |
295 |
$$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX)) |
|
296 |
endif |
|
13132 | 297 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
298 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
299 |
$1_SUFFIX := $(SHARED_LIBRARY_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
300 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
301 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
302 |
$1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$$($1_SUFFIX) |
20363 | 303 |
$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
|
304 |
$1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_LIBRARY) |
20363 | 305 |
endif |
306 |
||
307 |
ifneq (,$$($1_STATIC_LIBRARY)) |
|
308 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
309 |
$$(error STATIC_LIBRARY requires OUTPUT_DIR) |
|
13132 | 310 |
endif |
311 |
||
20363 | 312 |
ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY))) |
313 |
$$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR) |
|
314 |
endif |
|
13132 | 315 |
|
20363 | 316 |
ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY))) |
317 |
$$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX)) |
|
318 |
endif |
|
13132 | 319 |
|
20363 | 320 |
ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY))) |
321 |
$$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX)) |
|
13132 | 322 |
endif |
323 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
324 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
325 |
$1_SUFFIX := $(STATIC_LIBRARY_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
326 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
327 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
328 |
$1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$$($1_SUFFIX) |
20363 | 329 |
$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
|
330 |
$1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY) |
20363 | 331 |
endif |
332 |
||
333 |
ifneq (,$$($1_PROGRAM)) |
|
334 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
335 |
$$(error PROGRAM requires OUTPUT_DIR) |
|
13132 | 336 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
337 |
|
20363 | 338 |
ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM))) |
339 |
$$(error directory of PROGRAM should be specified using OUTPUT_DIR) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
340 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
341 |
|
20363 | 342 |
ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM))) |
343 |
$$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX)) |
|
13132 | 344 |
endif |
345 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
346 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
347 |
$1_SUFFIX := $(EXE_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
348 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
349 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
350 |
$1_BASENAME:=$$($1_PROGRAM)$$($1_SUFFIX) |
20363 | 351 |
$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
|
352 |
$1_NOSUFFIX:=$$($1_PROGRAM) |
20363 | 353 |
endif |
14111 | 354 |
|
20363 | 355 |
ifeq (,$$($1_TARGET)) |
356 |
$$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation) |
|
357 |
endif |
|
358 |
||
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
359 |
# Setup the toolchain to be used |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
360 |
$$(call SetIfEmpty, $1_TOOLCHAIN, TOOLCHAIN_DEFAULT) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
361 |
$$(call SetIfEmpty, $1_CC, $$($$($1_TOOLCHAIN)_CC)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
362 |
$$(call SetIfEmpty, $1_CXX, $$($$($1_TOOLCHAIN)_CXX)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
363 |
$$(call SetIfEmpty, $1_LD, $$($$($1_TOOLCHAIN)_LD)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
364 |
$$(call SetIfEmpty, $1_AR, $$($$($1_TOOLCHAIN)_AR)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
365 |
$$(call SetIfEmpty, $1_AS, $$($$($1_TOOLCHAIN)_AS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
366 |
$$(call SetIfEmpty, $1_MT, $$($$($1_TOOLCHAIN)_MT)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
367 |
$$(call SetIfEmpty, $1_RC, $$($$($1_TOOLCHAIN)_RC)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
368 |
$$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$($$($1_TOOLCHAIN)_SYSROOT_CFLAGS)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
369 |
$$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$($$($1_TOOLCHAIN)_SYSROOT_LDFLAGS)) |
20363 | 370 |
|
29862
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
371 |
ifneq ($$($1_MANIFEST), ) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
372 |
ifeq ($$($1_MANIFEST_VERSION), ) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
373 |
$$(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
|
374 |
endif |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
375 |
endif |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
376 |
|
20363 | 377 |
# Make sure the dirs exist. |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
378 |
$$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
379 |
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),, \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
380 |
$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
381 |
|
20363 | 382 |
# Find all files in the source trees. Sort to remove duplicates. |
383 |
$1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC))) |
|
384 |
# Extract the C/C++ files. |
|
385 |
$1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES))) |
|
386 |
$1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) |
|
387 |
ifneq ($$($1_EXCLUDE_FILES),) |
|
388 |
$1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES)) |
|
389 |
endif |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
390 |
$1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter $$(NATIVE_SOURCE_EXTENSIONS),$$($1_ALL_SRCS))) |
20363 | 391 |
ifneq (,$$(strip $$($1_INCLUDE_FILES))) |
392 |
$1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS)) |
|
393 |
endif |
|
394 |
ifeq (,$$($1_SRCS)) |
|
395 |
$$(error No sources found for $1 when looking inside the dirs $$($1_SRC)) |
|
396 |
endif |
|
397 |
# There can be only a single bin dir root, no need to foreach over the roots. |
|
398 |
$1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX)) |
|
399 |
# Now we have a list of all c/c++ files to compile: $$($1_SRCS) |
|
400 |
# 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
|
401 |
|
20363 | 402 |
# Prepend the source/bin path to the filter expressions. Then do the filtering. |
403 |
ifneq ($$($1_INCLUDES),) |
|
404 |
$1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) |
|
405 |
$1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS)) |
|
406 |
endif |
|
407 |
ifneq ($$($1_EXCLUDES),) |
|
25854 | 408 |
$1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES)) |
409 |
$1_SRC_EXCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
|
20363 | 410 |
$1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS)) |
411 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
412 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
413 |
$1_SRCS += $$($1_EXTRA_FILES) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
414 |
|
20363 | 415 |
# Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides |
416 |
# a reproducable order on the input files to the linker). |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
417 |
$1_EXPECTED_OBJS_FILENAMES := $$(call replace_with_obj_extension, $$(notdir $$($1_SRCS))) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
418 |
$1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$($1_EXPECTED_OBJS_FILENAMES))) |
20363 | 419 |
# Are there too many object files on disk? Perhaps because some source file was removed? |
420 |
$1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS))) |
|
421 |
# Clean out the superfluous object files. |
|
422 |
ifneq ($$($1_SUPERFLUOUS_OBJS),) |
|
423 |
$$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) |
|
424 |
endif |
|
425 |
||
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
426 |
# 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
|
427 |
$1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) |
20363 | 428 |
ifneq ($(DEBUG_LEVEL),release) |
429 |
# Pickup extra debug dependent variables for CFLAGS |
|
430 |
$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
|
431 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug) |
20363 | 432 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) |
433 |
else |
|
434 |
$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
|
435 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
20363 | 436 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) |
437 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
438 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
439 |
# 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
|
440 |
$1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)) |
20363 | 441 |
ifneq ($(DEBUG_LEVEL),release) |
442 |
# Pickup extra debug dependent variables for CXXFLAGS |
|
443 |
$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
|
444 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug) |
20363 | 445 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug) |
446 |
else |
|
447 |
$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
|
448 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
20363 | 449 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) |
450 |
endif |
|
451 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
452 |
ifeq ($$($1_DEBUG_SYMBOLS), true) |
20363 | 453 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
454 |
ifdef OPENJDK |
|
455 |
# Always add debug symbols |
|
456 |
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
|
457 |
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) |
|
458 |
else |
|
459 |
# Programs don't get the debug symbols added in the old build. It's not clear if |
|
460 |
# this is intentional. |
|
461 |
ifeq ($$($1_PROGRAM),) |
|
462 |
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
|
463 |
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) |
|
13697 | 464 |
endif |
20363 | 465 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
466 |
endif |
20363 | 467 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
468 |
|
29445
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
469 |
# If no C++ flags are explicitly set, default to using the C flags. |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
470 |
# After that, we can set additional C++ flags that should not interfere |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
471 |
# with the mechanism for copying the C flags by default. |
20363 | 472 |
ifeq ($$($1_CXXFLAGS),) |
473 |
$1_CXXFLAGS:=$$($1_CFLAGS) |
|
474 |
endif |
|
475 |
ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) |
|
476 |
$1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) |
|
477 |
endif |
|
478 |
||
479 |
ifneq (,$$($1_REORDER)) |
|
480 |
$1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) |
|
481 |
$1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) |
|
482 |
endif |
|
12801 | 483 |
|
29445
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
484 |
# 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
|
485 |
ifneq ($(DISABLE_WARNING_PREFIX),) |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
486 |
$1_EXTRA_CFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE))) |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
487 |
$1_EXTRA_CXXFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE))) |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
488 |
endif |
da21574cf682
8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents:
29436
diff
changeset
|
489 |
|
20363 | 490 |
ifeq (NONE, $$($1_OPTIMIZATION)) |
491 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_NONE) |
|
492 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE) |
|
493 |
else ifeq (LOW, $$($1_OPTIMIZATION)) |
|
494 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_NORM) |
|
495 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM) |
|
496 |
else ifeq (HIGH, $$($1_OPTIMIZATION)) |
|
497 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_HI) |
|
498 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI) |
|
499 |
else ifeq (HIGHEST, $$($1_OPTIMIZATION)) |
|
500 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST) |
|
501 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST) |
|
502 |
else ifneq (, $$($1_OPTIMIZATION)) |
|
503 |
$$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) |
|
504 |
endif |
|
13132 | 505 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
506 |
$1_BUILD_INFO := $$($1_OBJECT_DIR)/_build-info.marker |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
507 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
508 |
# 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
|
509 |
# 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
|
510 |
# variables used in the call to add_native_source below. |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
511 |
$1_COMPILE_VARDEPS := $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
512 |
$$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) \ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
513 |
$$($1_CC) $$($1_CXX) $$($1_AS) $$($1_ASFLAGS) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
514 |
$$(foreach s, $$($1_SRCS), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
515 |
$$($1_$$(notdir $$s)_CFLAGS) $$($1_$$(notdir $$s)_CXXFLAGS)) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
516 |
$1_COMPILE_VARDEPS_FILE := $$(call DependOnVariable, $1_COMPILE_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
517 |
$$($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
|
518 |
|
20363 | 519 |
# Now call add_native_source for each source file we are going to compile. |
520 |
$$(foreach p,$$($1_SRCS), \ |
|
521 |
$$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
522 |
$$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS), \ |
28355 | 523 |
$$($1_CC), \ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
524 |
$$($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
|
525 |
$$($1_CXX), $$($1_ASFLAGS)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
526 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
527 |
# Setup rule for printing progress info when compiling source files. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
528 |
# 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
|
529 |
$$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
530 |
ifeq ($$(wildcard $$($1_TARGET)),) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
531 |
$(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
|
532 |
else |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
533 |
$(ECHO) $$(strip 'Updating $$($1_BASENAME)' \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
534 |
$$(if $$(filter-out %.vardeps, $$?), \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
535 |
'from $$(words $$(filter-out %.vardeps, $$?)) file(s)') \ |
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
536 |
$$(if $$(filter %.vardeps, $$?), 'due to makefile changes')) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
537 |
endif |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
538 |
$(TOUCH) $$@ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
539 |
|
20363 | 540 |
# On windows we need to create a resource file |
541 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
542 |
ifneq (,$$($1_VERSIONINFO_RESOURCE)) |
|
543 |
$1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
544 |
$1_RES_DEP:=$$($1_RES).d |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
545 |
$1_RES_DEP_TARGETS:=$$($1_RES).d.targets |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
546 |
-include $$($1_RES_DEP) |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
547 |
-include $$($1_RES_DEP_TARGETS) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
548 |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
549 |
$1_RES_VARDEPS := $$($1_RC) $$($1_RC_FLAGS) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
550 |
$1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
551 |
$$($1_RES).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
552 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
553 |
$$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
554 |
$(ECHO) $(LOG_INFO) "Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET)))" |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
555 |
$$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \ |
28809
6481e27e00ee
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
28606
diff
changeset
|
556 |
$$($1_VERSIONINFO_RESOURCE) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
557 |
# Windows RC compiler does not support -showIncludes, so we mis-use CL for this. |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
558 |
$$($1_CC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \ |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
559 |
$(CC_OUT_OPTION)$$($1_RES_DEP).obj $$($1_VERSIONINFO_RESOURCE) > $$($1_RES_DEP).raw 2>&1 || exit 0 |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
560 |
($(ECHO) $$($1_RES): \\ \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
561 |
&& $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).raw) > $$($1_RES_DEP) |
28810
86666ec06518
8072106: Properly handle dependencies for deleted header files
ihse
parents:
28809
diff
changeset
|
562 |
$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS) |
20363 | 563 |
endif |
564 |
endif |
|
12801 | 565 |
|
20363 | 566 |
# mapfile doesnt seem to be implemented on macosx (yet??) |
567 |
ifneq ($(OPENJDK_TARGET_OS),macosx) |
|
13132 | 568 |
ifneq ($(OPENJDK_TARGET_OS),windows) |
20363 | 569 |
$1_REAL_MAPFILE:=$$($1_MAPFILE) |
570 |
ifneq (,$$($1_REORDER)) |
|
571 |
$1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile |
|
12801 | 572 |
|
20363 | 573 |
$$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER) |
12801 | 574 |
$$(MKDIR) -p $$(@D) |
575 |
$$(CP) $$($1_MAPFILE) $$@.tmp |
|
13132 | 576 |
$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp |
12801 | 577 |
$$(MV) $$@.tmp $$@ |
20363 | 578 |
endif |
12801 | 579 |
endif |
20363 | 580 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
581 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
582 |
# Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables |
20363 | 583 |
# for LDFLAGS and LDFLAGS_SUFFIX |
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
584 |
$1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) |
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
585 |
$1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS)) |
20363 | 586 |
ifneq (,$$($1_REAL_MAPFILE)) |
587 |
$1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) |
|
588 |
endif |
|
589 |
||
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
590 |
# Need to make sure TARGET is first on list |
20363 | 591 |
$1 := $$($1_TARGET) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
592 |
ifeq ($$($1_STATIC_LIBRARY),) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
593 |
ifeq ($$($1_DEBUG_SYMBOLS), true) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
594 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
595 |
ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
596 |
ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR)) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
597 |
# The dependency on TARGET is needed on windows for debuginfo files |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
598 |
# to be rebuilt properly. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
599 |
$$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% $$($1_TARGET) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
600 |
$(CP) $$< $$@ |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
601 |
endif |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
602 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
603 |
# Generate debuginfo files. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
604 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
605 |
$1_EXTRA_LDFLAGS += "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \ |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
606 |
"-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map" |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
607 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \ |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
608 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
609 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
610 |
else ifeq ($(OPENJDK_TARGET_OS), solaris) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
611 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo |
27560 | 612 |
# Setup the command line creating debuginfo files, to be run after linking. |
613 |
# It cannot be run separately since it updates the original target file |
|
614 |
# |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
615 |
# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
616 |
# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
617 |
# empty section headers until a fixed $(OBJCOPY) is available. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
618 |
# An empty section header has sh_addr == 0 and sh_size == 0. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
619 |
# This problem has only been seen on Solaris X64, but we call this tool |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
620 |
# on all Solaris builds just in case. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
621 |
# |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
622 |
# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
623 |
# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. |
27560 | 624 |
$1_CREATE_DEBUGINFO_CMDS := \ |
625 |
$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$($1_TARGET) $$(NEWLINE) \ |
|
626 |
$(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \ |
|
627 |
$(CD) $$($1_OUTPUT_DIR) && \ |
|
628 |
$(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$($1_DEBUGINFO_FILES) $$($1_TARGET) |
|
629 |
$1_DEBUGINFO_EXTRA_DEPS := $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
630 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
631 |
else ifeq ($(OPENJDK_TARGET_OS), linux) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
632 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo |
27560 | 633 |
# Setup the command line creating debuginfo files, to be run after linking. |
634 |
# It cannot be run separately since it updates the original target file |
|
635 |
$1_CREATE_DEBUGINFO_CMDS := \ |
|
636 |
$(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \ |
|
637 |
$(CD) $$($1_OUTPUT_DIR) && \ |
|
638 |
$(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
|
639 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
640 |
endif # No MacOS X support |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
641 |
|
27560 | 642 |
# This dependency dance ensures that debug info files get rebuilt |
643 |
# properly if deleted. |
|
644 |
$$($1_TARGET): $$($1_DEBUGINFO_FILES) |
|
645 |
$$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS) |
|
646 |
||
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
647 |
ifeq ($(ZIP_DEBUGINFO_FILES), true) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
648 |
$1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
649 |
$1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP)) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
650 |
|
27560 | 651 |
# The dependency on TARGET is needed for debuginfo files |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
652 |
# to be rebuilt properly. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
653 |
$$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
654 |
$(CD) $$($1_OBJECT_DIR) \ |
23433
afe67de12b7d
8035134: JDK9 unix debug bundle manifest file list issue
erikj
parents:
23428
diff
changeset
|
655 |
&& $(ZIP) -q $$@ $$(notdir $$($1_DEBUGINFO_FILES)) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
656 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
657 |
else |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
658 |
$1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES)) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
659 |
endif |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
660 |
endif |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
661 |
endif # !MacOS X |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
662 |
endif # $1_DEBUG_SYMBOLS |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
663 |
endif # !STATIC_LIBRARY |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
664 |
|
20363 | 665 |
ifneq (,$$($1_LIBRARY)) |
666 |
# Generating a dynamic library. |
|
27560 | 667 |
$1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME)) |
20363 | 668 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
27560 | 669 |
$1_EXTRA_LDFLAGS += "-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" |
12801 | 670 |
endif |
671 |
||
20363 | 672 |
$1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) |
12801 | 673 |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
674 |
$1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
675 |
$$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) $$($1_CREATE_DEBUGINFO_CMDS) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
676 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
677 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
678 |
|
27560 | 679 |
$$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
680 |
$$($1_DEBUGINFO_EXTRA_DEPS) $$($1_VARDEPS_FILE) |
28357 | 681 |
$(ECHO) $(LOG_INFO) "Linking $$($1_BASENAME)" |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
682 |
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
28355 | 683 |
$(LD_OUT_OPTION)$$@ \ |
684 |
$$($1_EXPECTED_OBJS) $$($1_RES) \ |
|
685 |
$$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) |
|
27560 | 686 |
$$($1_CREATE_DEBUGINFO_CMDS) |
687 |
# Touch target to make sure it has a later time stamp than the debug |
|
688 |
# symbol files to avoid unnecessary relinking on rebuild. |
|
689 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
690 |
$(TOUCH) $$@ |
|
691 |
endif |
|
13132 | 692 |
|
20363 | 693 |
endif |
13132 | 694 |
|
20363 | 695 |
ifneq (,$$($1_STATIC_LIBRARY)) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
696 |
$1_VARDEPS := $$($1_AR) $$($1_ARFLAGS) $$($1_LDFLAGS_SUFFIX) \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
697 |
$$($1_EXTRA_LDFLAGS_SUFFIX) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
698 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
699 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
700 |
|
20363 | 701 |
# Generating a static library, ie object file archive. |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
702 |
$$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_VARDEPS_FILE) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
703 |
$(ECHO) $(LOG_INFO) "Archiving $$($1_STATIC_LIBRARY)" |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
704 |
$$($1_AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \ |
20363 | 705 |
$$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) |
706 |
endif |
|
13132 | 707 |
|
20363 | 708 |
ifneq (,$$($1_PROGRAM)) |
709 |
# A executable binary has been specified, setup the target for it. |
|
710 |
$1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) |
|
17066 | 711 |
|
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
712 |
$1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
713 |
$$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) $$($1_MT) \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
714 |
$$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
715 |
$1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
716 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
717 |
|
29862
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
718 |
$$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_MANIFEST) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
28357
diff
changeset
|
719 |
$$($1_DEBUGINFO_EXTRA_DEPS) $$($1_VARDEPS_FILE) |
28357 | 720 |
$(ECHO) $(LOG_INFO) "Linking executable $$($1_BASENAME)" |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
721 |
$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
28355 | 722 |
$(EXE_OUT_OPTION)$$($1_TARGET) \ |
723 |
$$($1_EXPECTED_OBJS) $$($1_RES) \ |
|
724 |
$$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) |
|
29862
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
725 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
3dc68ba14011
8077847: Better handling of Windows executable manifest version
ihse
parents:
29850
diff
changeset
|
726 |
ifneq ($$($1_MANIFEST), ) |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29862
diff
changeset
|
727 |
$$($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
|
728 |
endif |
27560 | 729 |
endif |
730 |
# This only works if the openjdk_codesign identity is present on the system. Let |
|
731 |
# silently fail otherwise. |
|
732 |
ifneq (,$(CODESIGN)) |
|
733 |
ifneq (,$$($1_CODESIGN)) |
|
734 |
$(CODESIGN) -s openjdk_codesign $$@ |
|
735 |
endif |
|
736 |
endif |
|
737 |
$$($1_CREATE_DEBUGINFO_CMDS) |
|
738 |
# Touch target to make sure it has a later time stamp than the debug |
|
739 |
# symbol files to avoid unnecessary relinking on rebuild. |
|
740 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
741 |
$(TOUCH) $$@ |
|
742 |
endif |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
743 |
|
20363 | 744 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
745 |
endef |
25854 | 746 |
|
747 |
endif # _NATIVE_COMPILATION_GMK |