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