make/common/NativeCompilation.gmk
author mockner
Thu, 24 Sep 2015 11:26:30 -0400
changeset 33099 55ad1d5370f6
parent 32462 f236112ab3d0
child 32568 fc5205c29b31
permissions -rw-r--r--
8130681: Kitchensink startup crashes JVM with NMT overlapping ranges Summary: add_committed_region now handles overlapping commits. Reviewed-by: hseigel, coleenp
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
    30
ifndef _NATIVE_COMPILATION_GMK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
    31
_NATIVE_COMPILATION_GMK := 1
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
    32
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    33
ifeq (,$(_MAKEBASE_GMK))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    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
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   117
ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   118
  UNIX_PATH_PREFIX := /cygdrive
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   119
else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys)
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   120
  UNIX_PATH_PREFIX :=
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   121
endif
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   146
  # param 1 = BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   147
  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   148
  # param 3 = the bin dir that stores all .o (.obj) and .d files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   149
  # param 4 = the c flags to the compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   150
  # param 5 = the c compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   151
  # param 6 = the c++ flags to the compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   155
  ifneq (,$$(filter %.c,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   158
    $1_$2_COMP=$5
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   159
    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   164
    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   165
  else ifneq (,$$(filter %.s,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   168
    $1_$2_COMP=$(AS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   173
    $1_$2_COMP=$7
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   177
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   180
  # Only continue if this object file hasn't been processed already. This lets the first found
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   184
    ifeq (,$$(filter %.s,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   185
      # And this is the dependency file for this obj file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   191
      # Include previously generated dependency information. (if it exists)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   194
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22473
diff changeset
   195
      ifeq ($(TOOLCHAIN_TYPE), microsoft)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   196
        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   197
            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   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
          ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s,$2), solstudio)
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   205
            # The Solaris studio compiler doesn't output the full path to the object file in the
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   206
            # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   207
	    $(call LogFailures, $$($1_$2_OBJ).log, $1_$$(notdir $2), \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   208
	        $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   209
	    $(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
   210
          else
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   211
	    $(call LogFailures, $$($1_$2_OBJ).log, $1_$$(notdir $2), \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   212
	        $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   213
          endif
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   214
        else
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   215
          # The Visual Studio compiler lacks a feature for generating make dependencies, but by
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   216
          # setting -showIncludes, all included files are printed. These are filtered out and
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   217
          # parsed into make dependences.
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   218
	  ($(call LogFailures, $$($1_$2_OBJ).log, $1_$$(notdir $2), \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   219
	      $$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   220
	          $(CC_OUT_OPTION)$$($1_$2_OBJ) $2) ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   221
	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v -e "^Note: including file:" \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   222
	          -e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \
28602
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27602
diff changeset
   223
	      exit `cat $$($1_$2_DEP).exitvalue`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   224
	  $(RM) $$($1_$2_DEP).exitvalue
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   225
	  ($(ECHO) $$@: \\ \
29436
91f4e8a8134f 8075054: Mixed case Windows path break native dependency checks
ihse
parents: 29312
diff changeset
   226
	  && $(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
   227
        endif
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   228
        # Create a dependency target file from the dependency file.
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   229
        # 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
   230
        ifneq ($$($1_$2_DEP),)
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   231
	  $(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
   232
        endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   233
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   234
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   235
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   236
# 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
   237
# executable).
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   238
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   239
# 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
   240
# 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
   241
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   242
# Remaining parameters are named arguments. These include:
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   243
#   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
   244
#   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
   245
#   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
   246
#   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
   247
#   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
   248
#   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
   249
#       typically the libraries linked to.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   250
#   ARFLAGS the archiver flags to be used
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   251
#   OBJECT_DIR the directory where we store the object files
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   252
#   LIBRARY the resulting library file
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   253
#   PROGRAM the resulting exec file
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   254
#   INCLUDES only pick source from these directories
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   255
#   EXCLUDES do not pick source from these directories
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   256
#   INCLUDE_FILES only compile exactly these files!
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   257
#   EXCLUDE_FILES with these names
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   258
#   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
   259
#   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
   260
#   RC_FLAGS flags for RC.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   261
#   MAPFILE mapfile
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   262
#   REORDER reorder file
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   263
#   DEBUG_SYMBOLS add debug symbols (if configured on)
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   264
#   CC the compiler to use, default is $(CC)
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   265
#   LD the linker to use, default is $(LD)
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   266
#   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
   267
#   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
   268
SetupNativeCompilation = $(NamedParamsMacroTemplate)
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   269
define SetupNativeCompilationBody
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   270
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   271
  ifneq (,$$($1_BIN))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   272
    $$(error BIN has been replaced with OBJECT_DIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   273
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   274
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   275
  ifneq (,$$($1_LIB))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   276
    $$(error LIB has been replaced with LIBRARY)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   277
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   278
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   279
  ifneq (,$$($1_EXE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   280
    $$(error EXE has been replaced with PROGRAM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   281
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   282
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   283
  ifneq (,$$($1_LIBRARY))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   284
    ifeq (,$$($1_OUTPUT_DIR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   285
      $$(error LIBRARY requires OUTPUT_DIR)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   286
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   287
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   288
    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   289
      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   290
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   291
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   292
    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   293
      $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   294
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   295
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   296
    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   297
      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   298
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   299
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   300
    ifeq ($$($1_SUFFIX), )
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   301
      $1_SUFFIX := $(SHARED_LIBRARY_SUFFIX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   302
    endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   303
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   304
    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$$($1_SUFFIX)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   305
    $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
   306
    $1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_LIBRARY)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   307
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   308
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   309
  ifneq (,$$($1_STATIC_LIBRARY))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   310
    ifeq (,$$($1_OUTPUT_DIR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   311
      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   312
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   313
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   314
    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   315
      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   316
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   317
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   318
    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   319
      $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   320
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   321
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   322
    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   323
      $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   324
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   325
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   326
    ifeq ($$($1_SUFFIX), )
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   327
      $1_SUFFIX := $(STATIC_LIBRARY_SUFFIX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   328
    endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   329
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   330
    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$$($1_SUFFIX)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   331
    $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
   332
    $1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   333
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   334
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   335
  ifneq (,$$($1_PROGRAM))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   336
    ifeq (,$$($1_OUTPUT_DIR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   337
      $$(error PROGRAM requires OUTPUT_DIR)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   338
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   339
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   340
    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   341
      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   342
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   343
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   344
    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   345
      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   346
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   347
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   348
    ifeq ($$($1_SUFFIX), )
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   349
      $1_SUFFIX := $(EXE_SUFFIX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   350
    endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   351
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   352
    $1_BASENAME:=$$($1_PROGRAM)$$($1_SUFFIX)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   353
    $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
   354
    $1_NOSUFFIX:=$$($1_PROGRAM)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   355
  endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   356
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   357
  ifeq (,$$($1_TARGET))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   358
    $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   359
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   360
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   361
  # Setup the toolchain to be used
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   362
  $$(call SetIfEmpty, $1_TOOLCHAIN, TOOLCHAIN_DEFAULT)
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   363
  $$(call SetIfEmpty, $1_CC, $$($$($1_TOOLCHAIN)_CC))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   364
  $$(call SetIfEmpty, $1_CXX, $$($$($1_TOOLCHAIN)_CXX))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   365
  $$(call SetIfEmpty, $1_LD, $$($$($1_TOOLCHAIN)_LD))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   366
  $$(call SetIfEmpty, $1_AR, $$($$($1_TOOLCHAIN)_AR))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   367
  $$(call SetIfEmpty, $1_AS, $$($$($1_TOOLCHAIN)_AS))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   368
  $$(call SetIfEmpty, $1_MT, $$($$($1_TOOLCHAIN)_MT))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   369
  $$(call SetIfEmpty, $1_RC, $$($$($1_TOOLCHAIN)_RC))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   370
  $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$($$($1_TOOLCHAIN)_SYSROOT_CFLAGS))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   371
  $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$($$($1_TOOLCHAIN)_SYSROOT_LDFLAGS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   372
29862
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   373
  ifneq ($$($1_MANIFEST), )
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   374
    ifeq ($$($1_MANIFEST_VERSION), )
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   375
      $$(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
   376
    endif
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   377
  endif
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   378
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   379
  # Make sure the dirs exist.
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   380
  $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR))
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   381
  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),, \
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   382
      $$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   383
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   384
  # Find all files in the source trees. Sort to remove duplicates.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   385
  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   386
  # Extract the C/C++ files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   387
  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   388
  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   389
  ifneq ($$($1_EXCLUDE_FILES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   390
    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   391
  endif
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   392
  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter $$(NATIVE_SOURCE_EXTENSIONS),$$($1_ALL_SRCS)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   393
  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   394
    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   395
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   396
  ifeq (,$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   397
    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   398
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   399
  # There can be only a single bin dir root, no need to foreach over the roots.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   400
  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   401
  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   402
  # 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
   403
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   404
  # Prepend the source/bin path to the filter expressions. Then do the filtering.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   405
  ifneq ($$($1_INCLUDES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   406
    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   407
    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   408
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   409
  ifneq ($$($1_EXCLUDES),)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   410
    $1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   411
    $1_SRC_EXCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   412
    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   413
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   414
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   415
  $1_SRCS += $$($1_EXTRA_FILES)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   416
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   417
  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   418
  # a reproducable order on the input files to the linker).
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   419
  $1_EXPECTED_OBJS_FILENAMES := $$(call replace_with_obj_extension, $$(notdir $$($1_SRCS)))
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   420
  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$($1_EXPECTED_OBJS_FILENAMES)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   421
  # Are there too many object files on disk? Perhaps because some source file was removed?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   422
  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   423
  # Clean out the superfluous object files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   424
  ifneq ($$($1_SUPERFLUOUS_OBJS),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   425
    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   426
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   427
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   428
  # 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
   429
  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   430
  ifneq ($(DEBUG_LEVEL),release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   431
    # Pickup extra debug dependent variables for CFLAGS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   432
    $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
   433
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   434
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   435
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   436
    $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
   437
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   438
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   439
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   440
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   441
  # 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
   442
  $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   443
  ifneq ($(DEBUG_LEVEL),release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   444
    # Pickup extra debug dependent variables for CXXFLAGS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   445
    $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
   446
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   447
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   448
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   449
    $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
   450
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   451
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   452
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   453
31015
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   454
  # If no C++ flags are explicitly set, default to using the C flags.
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   455
  # After that, we can set additional C++ flags that should not interfere
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   456
  # with the mechanism for copying the C flags by default.
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   457
  ifeq ($$($1_CXXFLAGS),)
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   458
    $1_CXXFLAGS:=$$($1_CFLAGS)
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   459
  endif
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   460
  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   461
    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   462
  endif
babc2e8b3e97 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
omajid
parents: 30415
diff changeset
   463
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   464
  ifeq ($$($1_DEBUG_SYMBOLS), true)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   465
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   466
      ifdef OPENJDK
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   467
        # Always add debug symbols
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   468
        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   469
        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   470
      else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   471
        # Programs don't get the debug symbols added in the old build. It's not clear if
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   472
        # this is intentional.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   473
        ifeq ($$($1_PROGRAM),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   474
          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   475
          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   476
        endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   477
      endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   478
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   479
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   480
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   481
  ifneq (,$$($1_REORDER))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   482
    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   483
    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   484
  endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   485
29445
da21574cf682 8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents: 29436
diff changeset
   486
  # 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
   487
  ifneq ($(DISABLE_WARNING_PREFIX),)
da21574cf682 8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents: 29436
diff changeset
   488
    $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
   489
    $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
   490
  endif
da21574cf682 8075176: DISABLED_WARNINGS caused C++ compiler flags to get lost
ihse
parents: 29436
diff changeset
   491
30415
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   492
  # Check if warnings should be considered errors.
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   493
  # Pick first binary and toolchain specific, then binary specific, then general setting.
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   494
  ifeq ($$($1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE)),)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   495
    ifeq ($$($1_WARNINGS_AS_ERRORS),)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   496
      $1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE) := $$(WARNINGS_AS_ERRORS)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   497
    else
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   498
      $1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE) := $$($1_WARNINGS_AS_ERRORS)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   499
    endif
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   500
  endif
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   501
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   502
  ifeq ($$($1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE)), true)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   503
    $1_EXTRA_CFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   504
    $1_EXTRA_CXXFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   505
  endif
c5629d65265d 8074859: Turn on warnings as error
ihse
parents: 29866
diff changeset
   506
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   507
  ifeq (NONE, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   508
    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   509
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   510
  else ifeq (LOW, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   511
    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   512
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   513
  else ifeq (HIGH, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   514
    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   515
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   516
  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   517
    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   518
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   519
  else ifneq (, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   520
    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   521
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   522
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   523
  $1_BUILD_INFO := $$($1_OBJECT_DIR)/_build-info.marker
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   524
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   525
  # 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
   526
  # 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
   527
  # variables used in the call to add_native_source below.
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   528
  $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
   529
      $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) \
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   530
      $$($1_CC) $$($1_CXX) $$($1_AS) $$($1_ASFLAGS) \
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   531
      $$(foreach s, $$($1_SRCS), \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   532
          $$($1_$$(notdir $$s)_CFLAGS) $$($1_$$(notdir $$s)_CXXFLAGS))
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   533
  $1_COMPILE_VARDEPS_FILE := $$(call DependOnVariable, $1_COMPILE_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   534
      $$($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
   535
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   536
  # Now call add_native_source for each source file we are going to compile.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   537
  $$(foreach p,$$($1_SRCS), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   538
      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   539
          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS), \
28355
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   540
          $$($1_CC), \
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   541
          $$($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
   542
          $$($1_CXX), $$($1_ASFLAGS))))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   543
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   544
  # Setup rule for printing progress info when compiling source files.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   545
  # 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
   546
  $$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   547
        ifeq ($$(wildcard $$($1_TARGET)),)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   548
	  $(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
   549
        else
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   550
	  $(ECHO) $$(strip 'Updating $$($1_BASENAME)' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   551
	      $$(if $$(filter-out %.vardeps, $$?), \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   552
	        'from $$(words $$(filter-out %.vardeps, $$?)) file(s)') \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   553
	      $$(if $$(filter %.vardeps, $$?), 'due to makefile changes'))
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   554
        endif
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   555
	$(TOUCH) $$@
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   556
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   557
  # On windows we need to create a resource file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   558
  ifeq ($(OPENJDK_TARGET_OS), windows)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   559
    ifneq (,$$($1_VERSIONINFO_RESOURCE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   560
      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   561
      $1_RES_DEP:=$$($1_RES).d
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   562
      $1_RES_DEP_TARGETS:=$$($1_RES).d.targets
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   563
      -include $$($1_RES_DEP)
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   564
      -include $$($1_RES_DEP_TARGETS)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   565
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   566
      $1_RES_VARDEPS := $$($1_RC) $$($1_RC_FLAGS)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   567
      $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   568
          $$($1_RES).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   569
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   570
      $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   571
		$(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
   572
		$$($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
   573
		    $$($1_VERSIONINFO_RESOURCE)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   574
                # 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
   575
		$$($1_CC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   576
		    $(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
   577
		($(ECHO) $$($1_RES): \\ \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   578
		&& $(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
   579
		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   580
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   581
  endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   582
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   583
  # mapfile doesnt seem to be implemented on macosx (yet??)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   584
  ifneq ($(OPENJDK_TARGET_OS),macosx)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   585
    ifneq ($(OPENJDK_TARGET_OS),windows)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   586
      $1_REAL_MAPFILE:=$$($1_MAPFILE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   587
      ifneq (,$$($1_REORDER))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   588
        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   589
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   590
        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   591
		$$(MKDIR) -p $$(@D)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   592
		$$(CP) $$($1_MAPFILE) $$@.tmp
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   593
		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   594
		$$(MV) $$@.tmp $$@
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   595
      endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   596
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   597
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   598
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   599
  # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   600
  # 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
   601
  $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
   602
  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   603
  ifneq (,$$($1_REAL_MAPFILE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   604
    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   605
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   606
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   607
  # Need to make sure TARGET is first on list
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   608
  $1 := $$($1_TARGET)
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   609
  ifeq ($$($1_STATIC_LIBRARY),)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   610
    ifeq ($$($1_DEBUG_SYMBOLS), true)
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   611
      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   612
        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
   613
          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
   614
            # 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
   615
            # to be rebuilt properly.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   616
            $$($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
   617
		$(CP) $$< $$@
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   618
          endif
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   619
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   620
          # Generate debuginfo files.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   621
          ifeq ($(OPENJDK_TARGET_OS), windows)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   622
            $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
   623
                "-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
   624
            $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
   625
                $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   626
32462
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 32344
diff changeset
   627
          else ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   628
            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   629
            # Setup the command line creating debuginfo files, to be run after linking.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   630
            # It cannot be run separately since it updates the original target file
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   631
            $1_CREATE_DEBUGINFO_CMDS := \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   632
                $(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   633
                $(CD) $$($1_OUTPUT_DIR) && \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   634
                    $(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
   635
          endif # No MacOS X support
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   636
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   637
          # This dependency dance ensures that debug info files get rebuilt
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   638
          # properly if deleted.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   639
          $$($1_TARGET): $$($1_DEBUGINFO_FILES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   640
          $$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   641
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   642
          ifeq ($(ZIP_DEBUGINFO_FILES), true)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   643
            $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
   644
            $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
   645
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   646
            # 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
   647
            # to be rebuilt properly.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   648
            $$($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
   649
		$(CD) $$($1_OBJECT_DIR) \
23433
afe67de12b7d 8035134: JDK9 unix debug bundle manifest file list issue
erikj
parents: 23428
diff changeset
   650
		&& $(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
   651
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   652
          else
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   653
            $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
   654
          endif
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   655
        endif
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   656
      endif # !MacOS X
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   657
    endif # $1_DEBUG_SYMBOLS
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   658
  endif # !STATIC_LIBRARY
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   659
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   660
  ifneq (,$$($1_LIBRARY))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   661
    # Generating a dynamic library.
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   662
    $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   663
    ifeq ($(OPENJDK_TARGET_OS), windows)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   664
      $1_EXTRA_LDFLAGS += "-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   665
    endif
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   666
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   667
    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   668
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   669
    $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
   670
        $$($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
   671
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   672
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   673
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   674
    $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \
32462
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 32344
diff changeset
   675
        $$($1_VARDEPS_FILE)
28357
75a20253de17 8069063: More merge errors following JDK-8049367
ihse
parents: 28355
diff changeset
   676
		$(ECHO) $(LOG_INFO) "Linking $$($1_BASENAME)"
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   677
		$(call LogFailures, $$($1_OBJECT_DIR)/$1_link.log, $1_link, \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   678
		    $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
28355
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   679
		    $(LD_OUT_OPTION)$$@ \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   680
		    $$($1_EXPECTED_OBJS) $$($1_RES) \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   681
		    $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   682
		$$($1_CREATE_DEBUGINFO_CMDS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   683
                # Touch target to make sure it has a later time stamp than the debug
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   684
                # symbol files to avoid unnecessary relinking on rebuild.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   685
                ifeq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   686
		  $(TOUCH) $$@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   687
                endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   688
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   689
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   690
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   691
  ifneq (,$$($1_STATIC_LIBRARY))
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   692
    $1_VARDEPS := $$($1_AR) $$($1_ARFLAGS) $$($1_LDFLAGS_SUFFIX) \
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   693
        $$($1_EXTRA_LDFLAGS_SUFFIX)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   694
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   695
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   696
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   697
    # Generating a static library, ie object file archive.
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   698
    $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_VARDEPS_FILE)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   699
	$(ECHO) $(LOG_INFO) "Archiving $$($1_STATIC_LIBRARY)"
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   700
	$(call LogFailures, $$($1_OBJECT_DIR)/$1_link.log, $1_link, \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   701
	    $$($1_AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   702
	        $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   703
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   704
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   705
  ifneq (,$$($1_PROGRAM))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   706
    # A executable binary has been specified, setup the target for it.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   707
    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
17066
b2bf9afdd360 8011152: Precision problems on sflt builds
aharlap
parents: 15051
diff changeset
   708
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   709
    $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
   710
        $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) $$($1_MT) \
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   711
        $$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   712
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   713
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   714
29862
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   715
    $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_MANIFEST) \
32462
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 32344
diff changeset
   716
        $$($1_VARDEPS_FILE)
28357
75a20253de17 8069063: More merge errors following JDK-8049367
ihse
parents: 28355
diff changeset
   717
		$(ECHO) $(LOG_INFO) "Linking executable $$($1_BASENAME)"
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   718
		$(call LogFailures, $$($1_OBJECT_DIR)/$1_link.log, $1_link, \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   719
		    $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   720
		        $(EXE_OUT_OPTION)$$($1_TARGET) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   721
		        $$($1_EXPECTED_OBJS) $$($1_RES) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31015
diff changeset
   722
		        $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX))
29862
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   723
                ifeq ($(OPENJDK_TARGET_OS), windows)
3dc68ba14011 8077847: Better handling of Windows executable manifest version
ihse
parents: 29850
diff changeset
   724
                  ifneq ($$($1_MANIFEST), )
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29862
diff changeset
   725
		    $$($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
   726
                  endif
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   727
                endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   728
                # This only works if the openjdk_codesign identity is present on the system. Let
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   729
                # silently fail otherwise.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   730
                ifneq (,$(CODESIGN))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   731
                  ifneq (,$$($1_CODESIGN))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   732
		    $(CODESIGN) -s openjdk_codesign $$@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   733
                  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   734
                endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   735
		$$($1_CREATE_DEBUGINFO_CMDS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   736
                # Touch target to make sure it has a later time stamp than the debug
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   737
                # symbol files to avoid unnecessary relinking on rebuild.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   738
                ifeq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   739
		  $(TOUCH) $$@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   740
                endif
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   741
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   742
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   743
endef
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   744
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   745
endif # _NATIVE_COMPILATION_GMK