author | ihse |
Fri, 16 Jan 2015 16:02:09 +0100 | |
changeset 28902 | 0c09b47449c8 |
parent 27602 | 236555ddac42 |
child 28904 | 0c7127cbc121 |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
2 |
# Copyright (c) 2011, 2014, 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 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
37 |
# Extensions of files handled by this macro. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
38 |
NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
39 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
40 |
# Replaces native source extensions with the object file extension in a string. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
41 |
# Param 1: the string containing source file names with extensions |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
42 |
# The surrounding strip is needed to keep additional whitespace out |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
43 |
define replace_with_obj_extension |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
44 |
$(strip \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
45 |
$(foreach extension, $(NATIVE_SOURCE_EXTENSIONS), \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
46 |
$(patsubst $(extension),%$(OBJ_SUFFIX),$(filter $(extension),$1))) \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
47 |
) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
48 |
endef |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
49 |
|
25882 | 50 |
ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin) |
51 |
UNIX_PATH_PREFIX := /cygdrive |
|
52 |
else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys) |
|
53 |
UNIX_PATH_PREFIX := |
|
54 |
endif |
|
55 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
56 |
WINDOWS_SHOWINCLUDE_SED_PATTERN := \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
57 |
-e '/^Note: including file:/!d' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
58 |
-e 's|Note: including file: *||' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
59 |
-e 's|\\|/|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
60 |
-e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
61 |
-e '/$(subst /,\/,$(TOPDIR))/!d' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
62 |
-e 's|$$$$| \\|g' \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
63 |
# |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
64 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
65 |
define add_native_source |
20363 | 66 |
# param 1 = BUILD_MYPACKAGE |
67 |
# parma 2 = the source file name (..../alfa.c or .../beta.cpp) |
|
68 |
# param 3 = the bin dir that stores all .o (.obj) and .d files. |
|
69 |
# param 4 = the c flags to the compiler |
|
70 |
# param 5 = the c compiler |
|
71 |
# param 6 = the c++ flags to the compiler |
|
72 |
# param 7 = the c++ compiler |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
73 |
# param 8 = the objc compiler |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
74 |
# param 9 = the flags to the assembler |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
75 |
|
20363 | 76 |
ifneq (,$$(filter %.c,$2)) |
77 |
# Compile as a C file |
|
78 |
$1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c |
|
79 |
$1_$2_COMP=$5 |
|
80 |
$1_$2_DEP_FLAG:=$(C_FLAG_DEPS) |
|
81 |
else ifneq (,$$(filter %.m,$2)) |
|
82 |
# Compile as a objective-c file |
|
83 |
$1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
84 |
$1_$2_COMP=$8 |
20363 | 85 |
$1_$2_DEP_FLAG:=$(C_FLAG_DEPS) |
86 |
else ifneq (,$$(filter %.s,$2)) |
|
87 |
# Compile as assembler file |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
88 |
$1_$2_FLAGS=$9 -DTHIS_FILE='"$$(<F)"' |
20363 | 89 |
$1_$2_COMP=$(AS) |
90 |
$1_$2_DEP_FLAG:= |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
91 |
else ifneq (,$$(filter %.cpp,$2)$$(filter %.mm,$2)) |
20363 | 92 |
# Compile as a C++ file |
93 |
$1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c |
|
94 |
$1_$2_COMP=$7 |
|
95 |
$1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS) |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
96 |
else |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
97 |
$$(error Internal error in NativeCompilation.gmk: no compiler for file $2) |
20363 | 98 |
endif |
99 |
# 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
|
100 |
$1_$2_OBJ := $3/$$(call replace_with_obj_extension, $$(notdir $2)) |
20363 | 101 |
# Only continue if this object file hasn't been processed already. This lets the first found |
102 |
# source file override any other with the same name. |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
103 |
ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_ALL_OBJS))) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
104 |
$1_ALL_OBJS+=$$($1_$2_OBJ) |
20363 | 105 |
ifeq (,$$(filter %.s,$2)) |
106 |
# And this is the dependency file for this obj file. |
|
107 |
$1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ)) |
|
108 |
# Include previously generated dependency information. (if it exists) |
|
109 |
-include $$($1_$2_DEP) |
|
110 |
||
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
111 |
ifeq ($(TOOLCHAIN_TYPE), microsoft) |
20363 | 112 |
$1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \ |
113 |
-Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ)) |
|
114 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
115 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
116 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
117 |
$$($1_$2_OBJ) : $2 | $$($1_BUILD_INFO) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
118 |
$(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
|
119 |
ifneq ($(TOOLCHAIN_TYPE), microsoft) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
120 |
# 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
|
121 |
# 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
|
122 |
ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s,$2), solstudio) |
20363 | 123 |
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 |
124 |
$(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
|
125 |
else |
20363 | 126 |
$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 |
127 |
endif |
|
16988
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
128 |
endif |
53de314b1c30
8011687: Support correct dependencies from header files on windows and solaris
erikj
parents:
15051
diff
changeset
|
129 |
# The Visual Studio compiler lacks a feature for generating make dependencies, but by |
20363 | 130 |
# 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
|
131 |
# parsed into make dependences. |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22473
diff
changeset
|
132 |
ifeq ($(TOOLCHAIN_TYPE), microsoft) |
20363 | 133 |
($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \ |
134 |
$(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \ |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
135 |
| $(TEE) $$($1_$2_DEP).raw | $(GREP) -v -e "^Note: including file:" \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
136 |
-e "^$(notdir $2)$$$$" ; exit `cat $$($1_$2_DEP).exitvalue` |
20363 | 137 |
$(RM) $$($1_$2_DEP).exitvalue |
138 |
($(ECHO) $$@: \\ \ |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
139 |
&& $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) > $$($1_$2_DEP) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
140 |
endif |
20363 | 141 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
142 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
143 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
144 |
# 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
|
145 |
# executable). |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
146 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
147 |
# 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
|
148 |
# 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
|
149 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
150 |
# Remaining parameters are named arguments. These include: |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
151 |
# 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
|
152 |
# LANG C or C++ |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
153 |
# 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
|
154 |
# 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
|
155 |
# 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
|
156 |
# 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
|
157 |
# typically the libraries linked to. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
158 |
# ARFLAGS the archiver flags to be used |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
159 |
# OBJECT_DIR the directory where we store the object files |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
160 |
# LIBRARY the resulting library file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
161 |
# PROGRAM the resulting exec file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
162 |
# INCLUDES only pick source from these directories |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
163 |
# EXCLUDES do not pick source from these directories |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
164 |
# INCLUDE_FILES only compile exactly these files! |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
165 |
# EXCLUDE_FILES with these names |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
166 |
# 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
|
167 |
# 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
|
168 |
# RC_FLAGS flags for RC. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
169 |
# MAPFILE mapfile |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
170 |
# REORDER reorder file |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
171 |
# DEBUG_SYMBOLS add debug symbols (if configured on) |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
172 |
# CC the compiler to use, default is $(CC) |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
173 |
# LDEXE the linker to use for linking executables, default is $(LDEXE) |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
174 |
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
175 |
define SetupNativeCompilation |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
176 |
$(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk)) |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
177 |
$(call EvalDebugWrapper,$(strip $1),$(call SetupNativeCompilationInner,$(strip $1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))) |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
178 |
endef |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
179 |
|
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27586
diff
changeset
|
180 |
define SetupNativeCompilationInner |
28902
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
27602
diff
changeset
|
181 |
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $(strip $($i)),$1_$(strip $($i)))$(NEWLINE)) |
20363 | 182 |
$(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26)) |
183 |
$(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk)) |
|
13132 | 184 |
|
20363 | 185 |
ifneq (,$$($1_BIN)) |
186 |
$$(error BIN has been replaced with OBJECT_DIR) |
|
187 |
endif |
|
13132 | 188 |
|
20363 | 189 |
ifneq (,$$($1_LIB)) |
190 |
$$(error LIB has been replaced with LIBRARY) |
|
191 |
endif |
|
13132 | 192 |
|
20363 | 193 |
ifneq (,$$($1_EXE)) |
194 |
$$(error EXE has been replaced with PROGRAM) |
|
195 |
endif |
|
13132 | 196 |
|
20363 | 197 |
ifneq (,$$($1_LIBRARY)) |
198 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
199 |
$$(error LIBRARY requires OUTPUT_DIR) |
|
13132 | 200 |
endif |
201 |
||
20363 | 202 |
ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY))) |
203 |
$$(error directory of LIBRARY should be specified using OUTPUT_DIR) |
|
204 |
endif |
|
13132 | 205 |
|
20363 | 206 |
ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY))) |
207 |
$$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX)) |
|
208 |
endif |
|
13132 | 209 |
|
20363 | 210 |
ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY))) |
211 |
$$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX)) |
|
212 |
endif |
|
13132 | 213 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
214 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
215 |
$1_SUFFIX := $(SHARED_LIBRARY_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
216 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
217 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
218 |
$1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$$($1_SUFFIX) |
20363 | 219 |
$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
|
220 |
$1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_LIBRARY) |
20363 | 221 |
endif |
222 |
||
223 |
ifneq (,$$($1_STATIC_LIBRARY)) |
|
224 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
225 |
$$(error STATIC_LIBRARY requires OUTPUT_DIR) |
|
13132 | 226 |
endif |
227 |
||
20363 | 228 |
ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY))) |
229 |
$$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR) |
|
230 |
endif |
|
13132 | 231 |
|
20363 | 232 |
ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY))) |
233 |
$$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX)) |
|
234 |
endif |
|
13132 | 235 |
|
20363 | 236 |
ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY))) |
237 |
$$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX)) |
|
13132 | 238 |
endif |
239 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
240 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
241 |
$1_SUFFIX := $(STATIC_LIBRARY_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
242 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
243 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
244 |
$1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$$($1_SUFFIX) |
20363 | 245 |
$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
|
246 |
$1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY) |
20363 | 247 |
endif |
248 |
||
249 |
ifneq (,$$($1_PROGRAM)) |
|
250 |
ifeq (,$$($1_OUTPUT_DIR)) |
|
251 |
$$(error PROGRAM requires OUTPUT_DIR) |
|
13132 | 252 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
253 |
|
20363 | 254 |
ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM))) |
255 |
$$(error directory of PROGRAM should be specified using OUTPUT_DIR) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
256 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
257 |
|
20363 | 258 |
ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM))) |
259 |
$$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX)) |
|
13132 | 260 |
endif |
261 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
262 |
ifeq ($$($1_SUFFIX), ) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
263 |
$1_SUFFIX := $(EXE_SUFFIX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
264 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
265 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
266 |
$1_BASENAME:=$$($1_PROGRAM)$$($1_SUFFIX) |
20363 | 267 |
$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
|
268 |
$1_NOSUFFIX:=$$($1_PROGRAM) |
20363 | 269 |
endif |
14111 | 270 |
|
20363 | 271 |
ifeq (,$$($1_TARGET)) |
272 |
$$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation) |
|
273 |
endif |
|
274 |
||
275 |
ifeq (,$$($1_LANG)) |
|
276 |
$$(error You have to specify LANG for native compilation $1) |
|
277 |
endif |
|
278 |
ifeq (C,$$($1_LANG)) |
|
279 |
ifeq ($$($1_LDEXE),) |
|
280 |
$1_LDEXE:=$(LDEXE) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
281 |
endif |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
282 |
ifeq ($$($1_LD),) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
283 |
$1_LD:=$(LD) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
284 |
endif |
20363 | 285 |
else |
286 |
ifeq (C++,$$($1_LANG)) |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
287 |
ifeq ($$($1_LD),) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
288 |
$1_LD:=$(LDCXX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
289 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
290 |
ifeq ($$($1_LDEXE),) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
291 |
$1_LDEXE:=$(LDEXECXX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
292 |
endif |
20363 | 293 |
else |
294 |
$$(error Unknown native language $$($1_LANG) for $1) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
295 |
endif |
20363 | 296 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
297 |
|
20363 | 298 |
ifeq ($$($1_CC),) |
299 |
$1_CC:=$(CC) |
|
300 |
endif |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
301 |
ifeq ($$($1_CXX),) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
302 |
$1_CXX:=$(CXX) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
303 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
304 |
ifeq ($$($1_OBJC),) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
305 |
$1_OBJC:=$(OBJC) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
306 |
endif |
20363 | 307 |
|
308 |
# Make sure the dirs exist. |
|
309 |
$$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR))) |
|
310 |
$$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
311 |
|
20363 | 312 |
# Find all files in the source trees. Sort to remove duplicates. |
313 |
$1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC))) |
|
314 |
# Extract the C/C++ files. |
|
315 |
$1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES))) |
|
316 |
$1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) |
|
317 |
ifneq ($$($1_EXCLUDE_FILES),) |
|
318 |
$1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES)) |
|
319 |
endif |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
320 |
$1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter $$(NATIVE_SOURCE_EXTENSIONS),$$($1_ALL_SRCS))) |
20363 | 321 |
ifneq (,$$(strip $$($1_INCLUDE_FILES))) |
322 |
$1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS)) |
|
323 |
endif |
|
324 |
ifeq (,$$($1_SRCS)) |
|
325 |
$$(error No sources found for $1 when looking inside the dirs $$($1_SRC)) |
|
326 |
endif |
|
327 |
# There can be only a single bin dir root, no need to foreach over the roots. |
|
328 |
$1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX)) |
|
329 |
# Now we have a list of all c/c++ files to compile: $$($1_SRCS) |
|
330 |
# 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
|
331 |
|
20363 | 332 |
# Prepend the source/bin path to the filter expressions. Then do the filtering. |
333 |
ifneq ($$($1_INCLUDES),) |
|
334 |
$1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) |
|
335 |
$1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS)) |
|
336 |
endif |
|
337 |
ifneq ($$($1_EXCLUDES),) |
|
25854 | 338 |
$1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES)) |
339 |
$1_SRC_EXCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
|
20363 | 340 |
$1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS)) |
341 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
342 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
343 |
$1_SRCS += $$($1_EXTRA_FILES) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
344 |
|
20363 | 345 |
# Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides |
346 |
# a reproducable order on the input files to the linker). |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
347 |
$1_EXPECTED_OBJS_FILENAMES := $$(call replace_with_obj_extension, $$(notdir $$($1_SRCS))) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
348 |
$1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$($1_EXPECTED_OBJS_FILENAMES))) |
20363 | 349 |
# Are there too many object files on disk? Perhaps because some source file was removed? |
350 |
$1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS))) |
|
351 |
# Clean out the superfluous object files. |
|
352 |
ifneq ($$($1_SUPERFLUOUS_OBJS),) |
|
353 |
$$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) |
|
354 |
endif |
|
355 |
||
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
356 |
# 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
|
357 |
$1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) |
20363 | 358 |
ifneq ($(DEBUG_LEVEL),release) |
359 |
# Pickup extra debug dependent variables for CFLAGS |
|
360 |
$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
|
361 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug) |
20363 | 362 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) |
363 |
else |
|
364 |
$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
|
365 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
20363 | 366 |
$1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) |
367 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
368 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
369 |
# 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
|
370 |
$1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)) |
20363 | 371 |
ifneq ($(DEBUG_LEVEL),release) |
372 |
# Pickup extra debug dependent variables for CXXFLAGS |
|
373 |
$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
|
374 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug) |
20363 | 375 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug) |
376 |
else |
|
377 |
$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
|
378 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
20363 | 379 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) |
380 |
endif |
|
381 |
||
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
382 |
ifeq ($$($1_DEBUG_SYMBOLS), true) |
20363 | 383 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
384 |
ifdef OPENJDK |
|
385 |
# Always add debug symbols |
|
386 |
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
|
387 |
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) |
|
388 |
else |
|
389 |
# Programs don't get the debug symbols added in the old build. It's not clear if |
|
390 |
# this is intentional. |
|
391 |
ifeq ($$($1_PROGRAM),) |
|
392 |
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
|
393 |
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) |
|
13697 | 394 |
endif |
20363 | 395 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
396 |
endif |
20363 | 397 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
398 |
|
20363 | 399 |
ifeq ($$($1_CXXFLAGS),) |
400 |
$1_CXXFLAGS:=$$($1_CFLAGS) |
|
401 |
endif |
|
402 |
ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) |
|
403 |
$1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) |
|
404 |
endif |
|
405 |
||
406 |
ifneq (,$$($1_REORDER)) |
|
407 |
$1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) |
|
408 |
$1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) |
|
409 |
endif |
|
12801 | 410 |
|
20363 | 411 |
ifeq (NONE, $$($1_OPTIMIZATION)) |
412 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_NONE) |
|
413 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE) |
|
414 |
else ifeq (LOW, $$($1_OPTIMIZATION)) |
|
415 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_NORM) |
|
416 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM) |
|
417 |
else ifeq (HIGH, $$($1_OPTIMIZATION)) |
|
418 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_HI) |
|
419 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI) |
|
420 |
else ifeq (HIGHEST, $$($1_OPTIMIZATION)) |
|
421 |
$1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST) |
|
422 |
$1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST) |
|
423 |
else ifneq (, $$($1_OPTIMIZATION)) |
|
424 |
$$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) |
|
425 |
endif |
|
13132 | 426 |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
427 |
$1_BUILD_INFO := $$($1_OBJECT_DIR)/_build-info.marker |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
428 |
|
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
429 |
# Setup rule for printing progress info when compiling source files. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
430 |
# This is a rough heuristic and may not always print accurate information. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
431 |
$$($1_BUILD_INFO): $$($1_SRCS) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
432 |
ifeq ($$(wildcard $$($1_TARGET)),) |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
433 |
$(ECHO) 'Creating $$($1_BASENAME) from $$(words $$?) file(s)' |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
434 |
else |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
435 |
$(ECHO) 'Updating $$($1_BASENAME) from $$(words $$?) file(s)' |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
436 |
endif |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
437 |
$(TOUCH) $$@ |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
22721
diff
changeset
|
438 |
|
20363 | 439 |
# Now call add_native_source for each source file we are going to compile. |
440 |
$$(foreach p,$$($1_SRCS), \ |
|
441 |
$$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
442 |
$(SYSROOT_CFLAGS) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
443 |
$(SYSROOT_CFLAGS) $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$($1_CXX),$$($1_OBJC),$$($1_ASFLAGS)))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
444 |
|
20363 | 445 |
# On windows we need to create a resource file |
446 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
447 |
ifneq (,$$($1_VERSIONINFO_RESOURCE)) |
|
448 |
$1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res |
|
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
449 |
$1_RES_DEP:=$$($1_RES).d |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
450 |
-include $$($1_RES_DEP) |
20363 | 451 |
$$($1_RES): $$($1_VERSIONINFO_RESOURCE) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
452 |
$(ECHO) $(LOG_INFO) "Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET)))" |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
453 |
$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
454 |
# Windows RC compiler does not support -showIncludes, so we mis-use CL for this. |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
455 |
$(CC) $$($1_RC_FLAGS) -showIncludes -nologo -TC \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
456 |
$(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
|
457 |
($(ECHO) $$($1_RES): \\ \ |
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
458 |
&& $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).raw) > $$($1_RES_DEP) |
20363 | 459 |
endif |
460 |
ifneq (,$$($1_MANIFEST)) |
|
461 |
$1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest |
|
462 |
IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER) |
|
463 |
$$($1_GEN_MANIFEST): $$($1_MANIFEST) |
|
12801 | 464 |
$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@ |
465 |
endif |
|
20363 | 466 |
endif |
12801 | 467 |
|
20363 | 468 |
# mapfile doesnt seem to be implemented on macosx (yet??) |
469 |
ifneq ($(OPENJDK_TARGET_OS),macosx) |
|
13132 | 470 |
ifneq ($(OPENJDK_TARGET_OS),windows) |
20363 | 471 |
$1_REAL_MAPFILE:=$$($1_MAPFILE) |
472 |
ifneq (,$$($1_REORDER)) |
|
473 |
$1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile |
|
12801 | 474 |
|
20363 | 475 |
$$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER) |
12801 | 476 |
$$(MKDIR) -p $$(@D) |
477 |
$$(CP) $$($1_MAPFILE) $$@.tmp |
|
13132 | 478 |
$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp |
12801 | 479 |
$$(MV) $$@.tmp $$@ |
20363 | 480 |
endif |
12801 | 481 |
endif |
20363 | 482 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
483 |
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25882
diff
changeset
|
484 |
# Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables |
20363 | 485 |
# 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
|
486 |
$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
|
487 |
$1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS)) |
20363 | 488 |
ifneq (,$$($1_REAL_MAPFILE)) |
489 |
$1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) |
|
490 |
endif |
|
491 |
||
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
492 |
# Need to make sure TARGET is first on list |
20363 | 493 |
$1 := $$($1_TARGET) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
494 |
ifeq ($$($1_STATIC_LIBRARY),) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
495 |
ifeq ($$($1_DEBUG_SYMBOLS), true) |
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
496 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
497 |
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
|
498 |
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
|
499 |
# 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
|
500 |
# to be rebuilt properly. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
501 |
$$($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
|
502 |
$(CP) $$< $$@ |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
503 |
endif |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
504 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
505 |
# Generate debuginfo files. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
506 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
507 |
$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
|
508 |
"-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
|
509 |
$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
|
510 |
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
511 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
512 |
else ifeq ($(OPENJDK_TARGET_OS), solaris) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
513 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo |
27560 | 514 |
# Setup the command line creating debuginfo files, to be run after linking. |
515 |
# It cannot be run separately since it updates the original target file |
|
516 |
# |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
517 |
# 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
|
518 |
# 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
|
519 |
# 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
|
520 |
# 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
|
521 |
# 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
|
522 |
# 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
|
523 |
# |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
524 |
# $(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
|
525 |
# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. |
27560 | 526 |
$1_CREATE_DEBUGINFO_CMDS := \ |
527 |
$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$($1_TARGET) $$(NEWLINE) \ |
|
528 |
$(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \ |
|
529 |
$(CD) $$($1_OUTPUT_DIR) && \ |
|
530 |
$(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$($1_DEBUGINFO_FILES) $$($1_TARGET) |
|
531 |
$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
|
532 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
533 |
else ifeq ($(OPENJDK_TARGET_OS), linux) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
534 |
$1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo |
27560 | 535 |
# Setup the command line creating debuginfo files, to be run after linking. |
536 |
# It cannot be run separately since it updates the original target file |
|
537 |
$1_CREATE_DEBUGINFO_CMDS := \ |
|
538 |
$(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \ |
|
539 |
$(CD) $$($1_OUTPUT_DIR) && \ |
|
540 |
$(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
|
541 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
542 |
endif # No MacOS X support |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
543 |
|
27560 | 544 |
# This dependency dance ensures that debug info files get rebuilt |
545 |
# properly if deleted. |
|
546 |
$$($1_TARGET): $$($1_DEBUGINFO_FILES) |
|
547 |
$$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS) |
|
548 |
||
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
549 |
ifeq ($(ZIP_DEBUGINFO_FILES), true) |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
550 |
$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
|
551 |
$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
|
552 |
|
27560 | 553 |
# 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
|
554 |
# to be rebuilt properly. |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
555 |
$$($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
|
556 |
$(CD) $$($1_OBJECT_DIR) \ |
23433
afe67de12b7d
8035134: JDK9 unix debug bundle manifest file list issue
erikj
parents:
23428
diff
changeset
|
557 |
&& $(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
|
558 |
|
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
559 |
else |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
560 |
$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
|
561 |
endif |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
562 |
endif |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
563 |
endif # !MacOS X |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
564 |
endif # $1_DEBUG_SYMBOLS |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
565 |
endif # !STATIC_LIBRARY |
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
566 |
|
20363 | 567 |
ifneq (,$$($1_LIBRARY)) |
568 |
# Generating a dynamic library. |
|
27560 | 569 |
$1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME)) |
20363 | 570 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
27560 | 571 |
$1_EXTRA_LDFLAGS += "-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" |
12801 | 572 |
endif |
573 |
||
20363 | 574 |
$1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) |
12801 | 575 |
|
27560 | 576 |
$$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \ |
577 |
$$($1_DEBUGINFO_EXTRA_DEPS) |
|
578 |
$$(call LINKING_MSG,$$($1_BASENAME)) |
|
27602 | 579 |
$$($1_LD) $(SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \ |
27560 | 580 |
$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \ |
581 |
$$($1_EXTRA_LDFLAGS_SUFFIX) |
|
582 |
$$($1_CREATE_DEBUGINFO_CMDS) |
|
583 |
# Touch target to make sure it has a later time stamp than the debug |
|
584 |
# symbol files to avoid unnecessary relinking on rebuild. |
|
585 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
586 |
$(TOUCH) $$@ |
|
587 |
endif |
|
13132 | 588 |
|
20363 | 589 |
endif |
13132 | 590 |
|
20363 | 591 |
ifneq (,$$($1_STATIC_LIBRARY)) |
592 |
# Generating a static library, ie object file archive. |
|
27560 | 593 |
$$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) |
27593
4703225f5be4
8065913: Various improvements in SetupNativeCompilation
ihse
parents:
27592
diff
changeset
|
594 |
$(ECHO) $(LOG_INFO) "Archiving $$($1_STATIC_LIBRARY)" |
22467 | 595 |
$(AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \ |
20363 | 596 |
$$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) |
597 |
endif |
|
13132 | 598 |
|
20363 | 599 |
ifneq (,$$($1_PROGRAM)) |
600 |
# A executable binary has been specified, setup the target for it. |
|
601 |
$1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) |
|
17066 | 602 |
|
27560 | 603 |
$$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) \ |
604 |
$$($1_DEBUGINFO_EXTRA_DEPS) |
|
605 |
$$(call LINKING_EXE_MSG,$$($1_BASENAME)) |
|
27602 | 606 |
$$($1_LDEXE) $(SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \ |
27560 | 607 |
$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \ |
608 |
$$($1_EXTRA_LDFLAGS_SUFFIX) |
|
609 |
ifneq (,$$($1_GEN_MANIFEST)) |
|
610 |
$(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 |
|
611 |
endif |
|
612 |
# This only works if the openjdk_codesign identity is present on the system. Let |
|
613 |
# silently fail otherwise. |
|
614 |
ifneq (,$(CODESIGN)) |
|
615 |
ifneq (,$$($1_CODESIGN)) |
|
616 |
$(CODESIGN) -s openjdk_codesign $$@ |
|
617 |
endif |
|
618 |
endif |
|
619 |
$$($1_CREATE_DEBUGINFO_CMDS) |
|
620 |
# Touch target to make sure it has a later time stamp than the debug |
|
621 |
# symbol files to avoid unnecessary relinking on rebuild. |
|
622 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
623 |
$(TOUCH) $$@ |
|
624 |
endif |
|
22178
5193a7e23f14
8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents:
21759
diff
changeset
|
625 |
|
20363 | 626 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
627 |
endef |
25854 | 628 |
|
629 |
endif # _NATIVE_COMPILATION_GMK |