make/common/NativeCompilation.gmk
author ihse
Fri, 06 Feb 2015 12:37:31 +0100
changeset 28810 86666ec06518
parent 28809 6481e27e00ee
child 28908 fc8fe39b34cf
child 28812 6c36bc1ccc0e
permissions -rw-r--r--
8072106: Properly handle dependencies for deleted header files Reviewed-by: erikj
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
     2
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
# When you read this source. Remember that $(sort ...) has the side effect
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
# of removing duplicates. It is actually this side effect that is
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
# desired whenever sort is used below!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
    30
ifndef _NATIVE_COMPILATION_GMK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
    31
_NATIVE_COMPILATION_GMK := 1
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
    32
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    33
ifeq (,$(_MAKEBASE_GMK))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    34
  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    37
# Extensions of files handled by this macro.
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    38
NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    39
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    40
# Replaces native source extensions with the object file extension in a string.
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    41
# Param 1: the string containing source file names with extensions
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    42
# The surrounding strip is needed to keep additional whitespace out
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    43
define replace_with_obj_extension
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    44
$(strip \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    45
  $(foreach extension, $(NATIVE_SOURCE_EXTENSIONS), \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    46
      $(patsubst $(extension),%$(OBJ_SUFFIX),$(filter $(extension),$1))) \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    47
)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    48
endef
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    49
25882
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
    50
ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
    51
  UNIX_PATH_PREFIX := /cygdrive
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
    52
else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys)
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
    53
  UNIX_PATH_PREFIX :=
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
    54
endif
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
    55
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    56
# 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
    57
# into a make syntax dependency file (.d)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    58
WINDOWS_SHOWINCLUDE_SED_PATTERN := \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    59
    -e '/^Note: including file:/!d' \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    60
    -e 's|Note: including file: *||' \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    61
    -e 's|\\|/|g' \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    62
    -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    63
    -e '/$(subst /,\/,$(TOPDIR))/!d' \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    64
    -e 's|$$$$| \\|g' \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    65
    #
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    66
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    67
# 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
    68
# of make targets for dependent files (.d.targets)
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    69
DEPENDENCY_TARGET_SED_PATTERN := \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    70
    -e 's/\#.*//' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    71
    -e 's/^[^:]*: *//' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    72
    -e 's/ *\\$$$$//' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    73
    -e '/^$$$$/ d' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    74
    -e 's/$$$$/ :/' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    75
    #
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
    76
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    77
define add_native_source
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    78
  # param 1 = BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    79
  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    80
  # 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
    81
  # param 4 = the c flags to the compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    82
  # param 5 = the c compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    83
  # param 6 = the c++ flags to the compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    84
  # param 7 = the c++ compiler
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    85
  # param 8 = the objc compiler
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    86
  # param 9 = the flags to the assembler
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    87
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    88
  ifneq (,$$(filter %.c,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    89
    # Compile as a C file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    90
    $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    91
    $1_$2_COMP=$5
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    92
    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    93
  else ifneq (,$$(filter %.m,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    94
    # Compile as a objective-c file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    95
    $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
    96
    $1_$2_COMP=$8
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    97
    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    98
  else ifneq (,$$(filter %.s,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
    99
    # Compile as assembler file
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   100
    $1_$2_FLAGS=$9 -DTHIS_FILE='"$$(<F)"'
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   101
    $1_$2_COMP=$(AS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   102
    $1_$2_DEP_FLAG:=
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   103
  else ifneq (,$$(filter %.cpp,$2)$$(filter %.mm,$2))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   104
    # Compile as a C++ file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   105
    $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   106
    $1_$2_COMP=$7
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   107
    $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   108
  else
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   109
    $$(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
   110
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   111
  # 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
   112
  $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
   113
  # 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
   114
  # source file override any other with the same name.
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   115
  ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_ALL_OBJS)))
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   116
    $1_ALL_OBJS+=$$($1_$2_OBJ)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   117
    ifeq (,$$(filter %.s,$2))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   118
      # And this is the dependency file for this obj file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   119
      $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
   120
      # The dependency target file lists all dependencies as empty targets
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   121
      # 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
   122
      $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
   123
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   124
      # Include previously generated dependency information. (if it exists)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   125
      -include $$($1_$2_DEP)
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   126
      -include $$($1_$2_DEP_TARGETS)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   127
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22473
diff changeset
   128
      ifeq ($(TOOLCHAIN_TYPE), microsoft)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   129
        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   130
            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   131
      endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   132
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   133
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   134
    $$($1_$2_OBJ) : $2 $$($1_COMPILE_VARDEPS_FILE) | $$($1_BUILD_INFO)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   135
	$(ECHO) $(LOG_INFO) "Compiling $$(notdir $2) (for $$(notdir $$($1_TARGET)))"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22473
diff changeset
   136
        ifneq ($(TOOLCHAIN_TYPE), microsoft)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22473
diff changeset
   137
          # The Solaris studio compiler doesn't output the full path to the object file in the
16988
53de314b1c30 8011687: Support correct dependencies from header files on windows and solaris
erikj
parents: 15051
diff changeset
   138
          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22473
diff changeset
   139
          ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s,$2), solstudio)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   140
	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   141
	    $(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
   142
          else
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   143
	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   144
          endif
16988
53de314b1c30 8011687: Support correct dependencies from header files on windows and solaris
erikj
parents: 15051
diff changeset
   145
        endif
53de314b1c30 8011687: Support correct dependencies from header files on windows and solaris
erikj
parents: 15051
diff changeset
   146
        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   147
        # setting -showIncludes, all included files are printed. These are filtered out and
16988
53de314b1c30 8011687: Support correct dependencies from header files on windows and solaris
erikj
parents: 15051
diff changeset
   148
        # parsed into make dependences.
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22473
diff changeset
   149
        ifeq ($(TOOLCHAIN_TYPE), microsoft)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   150
	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   151
	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   152
	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v -e "^Note: including file:" \
28602
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27602
diff changeset
   153
	      -e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27602
diff changeset
   154
	      exit `cat $$($1_$2_DEP).exitvalue`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   155
	  $(RM) $$($1_$2_DEP).exitvalue
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   156
	  ($(ECHO) $$@: \\ \
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   157
	  && $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) > $$($1_$2_DEP)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
        endif
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   159
        # Create a dependency target file from the dependency file.
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   160
        # Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   161
        ifneq ($$($1_$2_DEP),)
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   162
	  $(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
   163
        endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   164
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   166
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   167
# 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
   168
# executable).
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   169
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   170
# 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
   171
# 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
   172
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   173
# Remaining parameters are named arguments. These include:
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   174
#   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
   175
#   LANG C or C++
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   176
#   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
   177
#   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
   178
#   LDFLAGS the linker flags to be used, used both for C and C++.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   179
#   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   180
#       typically the libraries linked to.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   181
#   ARFLAGS the archiver flags to be used
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   182
#   OBJECT_DIR the directory where we store the object files
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   183
#   LIBRARY the resulting library file
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   184
#   PROGRAM the resulting exec file
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   185
#   INCLUDES only pick source from these directories
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   186
#   EXCLUDES do not pick source from these directories
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   187
#   INCLUDE_FILES only compile exactly these files!
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   188
#   EXCLUDE_FILES with these names
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   189
#   EXTRA_FILES List of extra files not in any of the SRC dirs
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   190
#   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
   191
#   RC_FLAGS flags for RC.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   192
#   MAPFILE mapfile
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   193
#   REORDER reorder file
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   194
#   DEBUG_SYMBOLS add debug symbols (if configured on)
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   195
#   CC the compiler to use, default is $(CC)
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   196
#   LDEXE the linker to use for linking executables, default is $(LDEXE)
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   197
#   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   198
define SetupNativeCompilation
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   199
  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   200
  $(call EvalDebugWrapper,$(strip $1),$(call SetupNativeCompilationInner,$(strip $1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26)))
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   201
endef
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   202
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27586
diff changeset
   203
define SetupNativeCompilationInner
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   204
  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   205
  $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   206
  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   207
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   208
  ifneq (,$$($1_BIN))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   209
    $$(error BIN has been replaced with OBJECT_DIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   210
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   211
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   212
  ifneq (,$$($1_LIB))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   213
    $$(error LIB has been replaced with LIBRARY)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   214
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   215
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   216
  ifneq (,$$($1_EXE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   217
    $$(error EXE has been replaced with PROGRAM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   218
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   219
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   220
  ifneq (,$$($1_LIBRARY))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   221
    ifeq (,$$($1_OUTPUT_DIR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   222
      $$(error LIBRARY requires OUTPUT_DIR)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   223
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   224
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   225
    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   226
      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   227
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   228
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   229
    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   230
      $$(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
   231
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   232
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   233
    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   234
      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   235
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   236
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   237
    ifeq ($$($1_SUFFIX), )
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   238
      $1_SUFFIX := $(SHARED_LIBRARY_SUFFIX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   239
    endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   240
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   241
    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$$($1_SUFFIX)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   242
    $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
   243
    $1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_LIBRARY)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   244
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   245
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   246
  ifneq (,$$($1_STATIC_LIBRARY))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   247
    ifeq (,$$($1_OUTPUT_DIR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   248
      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   249
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   250
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   251
    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   252
      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   253
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   254
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   255
    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   256
      $$(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
   257
    endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   258
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   259
    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   260
      $$(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
   261
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   262
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   263
    ifeq ($$($1_SUFFIX), )
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   264
      $1_SUFFIX := $(STATIC_LIBRARY_SUFFIX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   265
    endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   266
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   267
    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$$($1_SUFFIX)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   268
    $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
   269
    $1_NOSUFFIX:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   270
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   271
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   272
  ifneq (,$$($1_PROGRAM))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   273
    ifeq (,$$($1_OUTPUT_DIR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   274
      $$(error PROGRAM requires OUTPUT_DIR)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   275
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   276
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   277
    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   278
      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   279
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   280
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   281
    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   282
      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   283
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   284
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   285
    ifeq ($$($1_SUFFIX), )
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   286
      $1_SUFFIX := $(EXE_SUFFIX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   287
    endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   288
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   289
    $1_BASENAME:=$$($1_PROGRAM)$$($1_SUFFIX)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   290
    $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
   291
    $1_NOSUFFIX:=$$($1_PROGRAM)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   292
  endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   293
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   294
  ifeq (,$$($1_TARGET))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   295
    $$(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
   296
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   297
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   298
  ifeq (,$$($1_LANG))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   299
    $$(error You have to specify LANG for native compilation $1)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   300
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   301
  ifeq (C,$$($1_LANG))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   302
    ifeq ($$($1_LDEXE),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   303
      $1_LDEXE:=$(LDEXE)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   304
    endif
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   305
    ifeq ($$($1_LD),)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   306
      $1_LD:=$(LD)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   307
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   308
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   309
    ifeq (C++,$$($1_LANG))
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   310
      ifeq ($$($1_LD),)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   311
        $1_LD:=$(LDCXX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   312
      endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   313
      ifeq ($$($1_LDEXE),)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   314
        $1_LDEXE:=$(LDEXECXX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   315
      endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   316
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   317
      $$(error Unknown native language $$($1_LANG) for $1)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   318
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   319
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   320
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   321
  ifeq ($$($1_CC),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   322
    $1_CC:=$(CC)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   323
  endif
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   324
  ifeq ($$($1_CXX),)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   325
    $1_CXX:=$(CXX)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   326
  endif
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   327
  ifeq ($$($1_OBJC),)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   328
    $1_OBJC:=$(OBJC)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   329
  endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   330
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   331
  # Make sure the dirs exist.
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   332
  $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   333
  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   334
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   335
  # Find all files in the source trees. Sort to remove duplicates.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   336
  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   337
  # Extract the C/C++ files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   338
  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   339
  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   340
  ifneq ($$($1_EXCLUDE_FILES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   341
    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   342
  endif
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   343
  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter $$(NATIVE_SOURCE_EXTENSIONS),$$($1_ALL_SRCS)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   344
  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   345
    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   346
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   347
  ifeq (,$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   348
    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   349
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   350
  # 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
   351
  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   352
  # 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
   353
  # 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
   354
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   355
  # 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
   356
  ifneq ($$($1_INCLUDES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   357
    $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
   358
    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   359
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   360
  ifneq ($$($1_EXCLUDES),)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   361
    $1_SRC_EXCLUDES := $$(addsuffix /%,$$($1_EXCLUDES))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   362
    $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
   363
    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   364
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   365
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   366
  $1_SRCS += $$($1_EXTRA_FILES)
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   367
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   368
  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   369
  # a reproducable order on the input files to the linker).
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   370
  $1_EXPECTED_OBJS_FILENAMES := $$(call replace_with_obj_extension, $$(notdir $$($1_SRCS)))
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   371
  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$($1_EXPECTED_OBJS_FILENAMES)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   372
  # 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
   373
  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   374
  # Clean out the superfluous object files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   375
  ifneq ($$($1_SUPERFLUOUS_OBJS),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   376
    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   377
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   378
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   379
  # 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
   380
  $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
   381
  ifneq ($(DEBUG_LEVEL),release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   382
    # Pickup extra debug dependent variables for CFLAGS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   383
    $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
   384
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   385
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   386
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   387
    $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
   388
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   389
    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   390
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   391
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   392
  # 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
   393
  $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
   394
  ifneq ($(DEBUG_LEVEL),release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   395
    # Pickup extra debug dependent variables for CXXFLAGS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   396
    $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
   397
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   398
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   399
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   400
    $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
   401
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   402
    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   403
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   404
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   405
  ifeq ($$($1_DEBUG_SYMBOLS), true)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   406
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   407
      ifdef OPENJDK
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   408
        # Always add debug symbols
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   409
        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   410
        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   411
      else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   412
        # Programs don't get the debug symbols added in the old build. It's not clear if
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   413
        # this is intentional.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   414
        ifeq ($$($1_PROGRAM),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   415
          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   416
          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   417
        endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   418
      endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   419
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   420
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   421
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   422
  ifeq ($$($1_CXXFLAGS),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   423
    $1_CXXFLAGS:=$$($1_CFLAGS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   424
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   425
  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   426
    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   427
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   428
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   429
  ifneq (,$$($1_REORDER))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   430
    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   431
    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   432
  endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   433
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   434
  ifeq (NONE, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   435
    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   436
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   437
  else ifeq (LOW, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   438
    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   439
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   440
  else ifeq (HIGH, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   441
    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   442
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   443
  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   444
    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   445
    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   446
  else ifneq (, $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   447
    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   448
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   449
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   450
  $1_BUILD_INFO := $$($1_OBJECT_DIR)/_build-info.marker
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   451
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   452
  # 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
   453
  # 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
   454
  # variables used in the call to add_native_source below.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   455
  $1_COMPILE_VARDEPS := $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $(SYSROOT_CFLAGS) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   456
      $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   457
      $$($1_CC) $$($1_CXX) $$($1_OBJC) $$($1_ASFLAGS) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   458
      $$(foreach s, $$($1_SRCS), \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   459
          $$($1_$$(notdir $$s)_CFLAGS) $$($1_$$(notdir $$s)_CXXFLAGS))
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   460
  $1_COMPILE_VARDEPS_FILE := $$(call DependOnVariable, $1_COMPILE_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   461
      $$($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
   462
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   463
  # 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
   464
  $$(foreach p,$$($1_SRCS), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   465
      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
28355
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   466
          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $(SYSROOT_CFLAGS), \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   467
          $$($1_CC), \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   468
          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS) $(SYSROOT_CFLAGS), \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   469
          $$($1_CXX),$$($1_OBJC),$$($1_ASFLAGS))))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   470
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   471
  # Setup rule for printing progress info when compiling source files.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   472
  # 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
   473
  $$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   474
        ifeq ($$(wildcard $$($1_TARGET)),)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   475
	  $(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
   476
        else
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   477
	  $(ECHO) $$(strip 'Updating $$($1_BASENAME)' \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   478
	      $$(if $$(filter-out %.vardeps, $$?), \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   479
	        'from $$(words $$(filter-out %.vardeps, $$?)) file(s)') \
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   480
	      $$(if $$(filter %.vardeps, $$?), 'due to makefile changes'))
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   481
        endif
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   482
	$(TOUCH) $$@
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   483
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   484
  # On windows we need to create a resource file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   485
  ifeq ($(OPENJDK_TARGET_OS), windows)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   486
    ifneq (,$$($1_VERSIONINFO_RESOURCE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   487
      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   488
      $1_RES_DEP:=$$($1_RES).d
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   489
      $1_RES_DEP_TARGETS:=$$($1_RES).d.targets
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   490
      -include $$($1_RES_DEP)
28810
86666ec06518 8072106: Properly handle dependencies for deleted header files
ihse
parents: 28809
diff changeset
   491
      -include $$($1_RES_DEP_TARGETS)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   492
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   493
      $1_RES_VARDEPS := $(RC) $$($1_RC_FLAGS)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   494
      $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   495
          $$($1_RES).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   496
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   497
      $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   498
		$(ECHO) $(LOG_INFO) "Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET)))"
28809
6481e27e00ee 8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents: 28606
diff changeset
   499
		$(RC) $$($1_RC_FLAGS) $(SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
6481e27e00ee 8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents: 28606
diff changeset
   500
		    $$($1_VERSIONINFO_RESOURCE)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   501
                # Windows RC compiler does not support -showIncludes, so we mis-use CL for this.
28809
6481e27e00ee 8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents: 28606
diff changeset
   502
		$(CC) $$($1_RC_FLAGS) $(SYSROOT_CFLAGS) -showIncludes -nologo -TC \
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   503
		    $(CC_OUT_OPTION)$$($1_RES_DEP).obj $$($1_VERSIONINFO_RESOURCE) > $$($1_RES_DEP).raw 2>&1 || exit 0
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   504
		($(ECHO) $$($1_RES): \\ \
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   505
		&& $(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
   506
		$(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
   507
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   508
    ifneq (,$$($1_MANIFEST))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   509
      $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   510
      IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   511
      $1_MANIFEST_VARDEPS_FILE := $$(call DependOnVariable, IMVERSIONVALUE, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   512
          $$($1_GEN_MANIFEST).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   513
      $$($1_GEN_MANIFEST): $$($1_MANIFEST) $$($1_MANIFEST_VARDEPS_FILE)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   514
		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   515
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   516
  endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   517
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   518
  # mapfile doesnt seem to be implemented on macosx (yet??)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   519
  ifneq ($(OPENJDK_TARGET_OS),macosx)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   520
    ifneq ($(OPENJDK_TARGET_OS),windows)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   521
      $1_REAL_MAPFILE:=$$($1_MAPFILE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   522
      ifneq (,$$($1_REORDER))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   523
        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   524
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   525
        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   526
		$$(MKDIR) -p $$(@D)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   527
		$$(CP) $$($1_MAPFILE) $$@.tmp
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   528
		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   529
		$$(MV) $$@.tmp $$@
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   530
      endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   531
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   532
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   533
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   534
  # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   535
  # for LDFLAGS and LDFLAGS_SUFFIX
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   536
  $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 25882
diff changeset
   537
  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   538
  ifneq (,$$($1_REAL_MAPFILE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   539
    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   540
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   541
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   542
  # Need to make sure TARGET is first on list
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   543
  $1 := $$($1_TARGET)
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   544
  ifeq ($$($1_STATIC_LIBRARY),)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   545
    ifeq ($$($1_DEBUG_SYMBOLS), true)
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   546
      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   547
        ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   548
          ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   549
            # The dependency on TARGET is needed on windows for debuginfo files
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   550
            # to be rebuilt properly.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   551
            $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% $$($1_TARGET)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   552
		$(CP) $$< $$@
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   553
          endif
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   554
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   555
          # Generate debuginfo files.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   556
          ifeq ($(OPENJDK_TARGET_OS), windows)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   557
            $1_EXTRA_LDFLAGS += "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   558
                "-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map"
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   559
            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   560
                $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   561
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   562
          else ifeq ($(OPENJDK_TARGET_OS), solaris)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   563
            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   564
            # Setup the command line creating debuginfo files, to be run after linking.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   565
            # It cannot be run separately since it updates the original target file
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   566
            #
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   567
            # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   568
            # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   569
            # empty section headers until a fixed $(OBJCOPY) is available.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   570
            # An empty section header has sh_addr == 0 and sh_size == 0.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   571
            # This problem has only been seen on Solaris X64, but we call this tool
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   572
            # on all Solaris builds just in case.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   573
            #
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   574
            # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   575
            # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   576
            $1_CREATE_DEBUGINFO_CMDS := \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   577
                $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$($1_TARGET) $$(NEWLINE) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   578
                $(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   579
                $(CD) $$($1_OUTPUT_DIR) && \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   580
                    $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$($1_DEBUGINFO_FILES) $$($1_TARGET)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   581
            $1_DEBUGINFO_EXTRA_DEPS := $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   582
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   583
          else ifeq ($(OPENJDK_TARGET_OS), linux)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   584
            $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   585
            # Setup the command line creating debuginfo files, to be run after linking.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   586
            # It cannot be run separately since it updates the original target file
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   587
            $1_CREATE_DEBUGINFO_CMDS := \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   588
                $(OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) $$(NEWLINE) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   589
                $(CD) $$($1_OUTPUT_DIR) && \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   590
                    $(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
   591
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   592
          endif # No MacOS X support
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   593
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   594
          # This dependency dance ensures that debug info files get rebuilt
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   595
          # properly if deleted.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   596
          $$($1_TARGET): $$($1_DEBUGINFO_FILES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   597
          $$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   598
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   599
          ifeq ($(ZIP_DEBUGINFO_FILES), true)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   600
            $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   601
            $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP))
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   602
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   603
            # The dependency on TARGET is needed for debuginfo files
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   604
            # to be rebuilt properly.
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   605
            $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   606
		$(CD) $$($1_OBJECT_DIR) \
23433
afe67de12b7d 8035134: JDK9 unix debug bundle manifest file list issue
erikj
parents: 23428
diff changeset
   607
		&& $(ZIP) -q $$@ $$(notdir $$($1_DEBUGINFO_FILES))
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   608
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   609
          else
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   610
            $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES))
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   611
          endif
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   612
        endif
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   613
      endif # !MacOS X
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   614
    endif # $1_DEBUG_SYMBOLS
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   615
  endif # !STATIC_LIBRARY
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   616
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   617
  ifneq (,$$($1_LIBRARY))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   618
    # Generating a dynamic library.
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   619
    $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   620
    ifeq ($(OPENJDK_TARGET_OS), windows)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   621
      $1_EXTRA_LDFLAGS += "-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   622
    endif
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   623
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   624
    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   625
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   626
    $1_VARDEPS := $$($1_LD) $(SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   627
        $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   628
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   629
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   630
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   631
    $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   632
        $$($1_DEBUGINFO_EXTRA_DEPS) $$($1_VARDEPS_FILE)
28357
75a20253de17 8069063: More merge errors following JDK-8049367
ihse
parents: 28355
diff changeset
   633
		$(ECHO) $(LOG_INFO) "Linking $$($1_BASENAME)"
28355
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   634
		$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(SYSROOT_LDFLAGS) \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   635
		    $(LD_OUT_OPTION)$$@ \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   636
		    $$($1_EXPECTED_OBJS) $$($1_RES) \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   637
		    $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   638
		$$($1_CREATE_DEBUGINFO_CMDS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   639
                # Touch target to make sure it has a later time stamp than the debug
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   640
                # symbol files to avoid unnecessary relinking on rebuild.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   641
                ifeq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   642
		  $(TOUCH) $$@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   643
                endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   644
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   645
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   646
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   647
  ifneq (,$$($1_STATIC_LIBRARY))
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   648
    $1_VARDEPS := $(AR) $$($1_ARFLAGS) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   649
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   650
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   651
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   652
    # Generating a static library, ie object file archive.
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   653
    $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_VARDEPS_FILE)
27593
4703225f5be4 8065913: Various improvements in SetupNativeCompilation
ihse
parents: 27592
diff changeset
   654
	$(ECHO) $(LOG_INFO) "Archiving $$($1_STATIC_LIBRARY)"
22467
kvn
parents: 22466 21057
diff changeset
   655
	$(AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   656
	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   657
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   658
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   659
  ifneq (,$$($1_PROGRAM))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   660
    # A executable binary has been specified, setup the target for it.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   661
    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
17066
b2bf9afdd360 8011152: Precision problems on sflt builds
aharlap
parents: 15051
diff changeset
   662
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   663
    $1_VARDEPS := $$($1_LDEXE) $(SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   664
        $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   665
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   666
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   667
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   668
    $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) \
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28357
diff changeset
   669
        $$($1_DEBUGINFO_EXTRA_DEPS) $$($1_VARDEPS_FILE)
28357
75a20253de17 8069063: More merge errors following JDK-8049367
ihse
parents: 28355
diff changeset
   670
		$(ECHO) $(LOG_INFO) "Linking executable $$($1_BASENAME)"
28355
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   671
		$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(SYSROOT_LDFLAGS) \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   672
		    $(EXE_OUT_OPTION)$$($1_TARGET) \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   673
		    $$($1_EXPECTED_OBJS) $$($1_RES) \
00a473df1a5b 8068902: Solaris build fails with new 10u10 devkit
erikj
parents: 27602
diff changeset
   674
		    $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   675
                ifneq (,$$($1_GEN_MANIFEST))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   676
		  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   677
                endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   678
                # 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
   679
                # silently fail otherwise.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   680
                ifneq (,$(CODESIGN))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   681
                  ifneq (,$$($1_CODESIGN))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   682
		    $(CODESIGN) -s openjdk_codesign $$@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   683
                  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   684
                endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   685
		$$($1_CREATE_DEBUGINFO_CMDS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   686
                # Touch target to make sure it has a later time stamp than the debug
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   687
                # symbol files to avoid unnecessary relinking on rebuild.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   688
                ifeq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   689
		  $(TOUCH) $$@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25882
diff changeset
   690
                endif
22178
5193a7e23f14 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21759
diff changeset
   691
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18019
diff changeset
   692
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   693
endef
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   694
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23433
diff changeset
   695
endif # _NATIVE_COMPILATION_GMK