common/makefiles/NativeCompilation.gmk
changeset 20363 fa7663fc5d50
parent 18019 ea4d5096e411
child 20641 59b55d8f4a75
equal deleted inserted replaced
20362:5f8289bfda3e 20363:fa7663fc5d50
    25 
    25 
    26 # When you read this source. Remember that $(sort ...) has the side effect
    26 # When you read this source. Remember that $(sort ...) has the side effect
    27 # of removing duplicates. It is actually this side effect that is
    27 # of removing duplicates. It is actually this side effect that is
    28 # desired whenever sort is used below!
    28 # desired whenever sort is used below!
    29 
    29 
    30 ifeq  (,$(_MAKEBASE_GMK))
    30 ifeq (,$(_MAKEBASE_GMK))
    31     $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
    31   $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
    32 endif
    32 endif
    33 
    33 
    34 ifeq ($(COMPILER_TYPE),CC)
    34 ifeq ($(COMPILER_TYPE),CC)
    35     COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
    35   COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
    36     LINKING_MSG=echo $(LOG_INFO) "Linking $1"
    36   LINKING_MSG=echo $(LOG_INFO) "Linking $1"
    37     LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
    37   LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
    38     ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
    38   ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
    39 else
    39 else
    40     COMPILING_MSG=
    40   COMPILING_MSG=
    41     LINKING_MSG=
    41   LINKING_MSG=
    42     LINKING_EXE_MSG=
    42   LINKING_EXE_MSG=
    43     ARCHIVING_MSG=
    43   ARCHIVING_MSG=
    44 endif
    44 endif
    45 
    45 
    46 define add_native_source
    46 define add_native_source
    47     # param 1 = BUILD_MYPACKAGE
    47   # param 1 = BUILD_MYPACKAGE
    48     # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
    48   # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
    49     # param 3 = the bin dir that stores all .o (.obj) and .d files.
    49   # param 3 = the bin dir that stores all .o (.obj) and .d files.
    50     # param 4 = the c flags to the compiler
    50   # param 4 = the c flags to the compiler
    51     # param 5 = the c compiler
    51   # param 5 = the c compiler
    52     # param 6 = the c++ flags to the compiler
    52   # param 6 = the c++ flags to the compiler
    53     # param 7 = the c++ compiler
    53   # param 7 = the c++ compiler
    54     # param 8 = the flags to the assembler
    54   # param 8 = the flags to the assembler
    55 
    55 
    56     ifneq (,$$(filter %.c,$2))
    56   ifneq (,$$(filter %.c,$2))
    57         # Compile as a C file
    57     # Compile as a C file
    58         $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
    58     $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
    59         $1_$2_COMP=$5
    59     $1_$2_COMP=$5
    60         $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
    60     $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
    61     else ifneq (,$$(filter %.m,$2))
    61   else ifneq (,$$(filter %.m,$2))
    62         # Compile as a objective-c file
    62     # Compile as a objective-c file
    63         $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
    63     $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
    64         $1_$2_COMP=$5
    64     $1_$2_COMP=$5
    65         $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
    65     $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
    66     else ifneq (,$$(filter %.s,$2))
    66   else ifneq (,$$(filter %.s,$2))
    67         # Compile as assembler file
    67     # Compile as assembler file
    68         $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
    68     $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
    69         $1_$2_COMP=$(AS)
    69     $1_$2_COMP=$(AS)
    70         $1_$2_DEP_FLAG:=
    70     $1_$2_DEP_FLAG:=
    71     else
    71   else
    72         # Compile as a C++ file
    72     # Compile as a C++ file
    73         $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
    73     $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
    74         $1_$2_COMP=$7
    74     $1_$2_COMP=$7
    75         $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
    75     $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
    76     endif
    76   endif
    77     # Generate the .o (.obj) file name and place it in the bin dir.
    77   # Generate the .o (.obj) file name and place it in the bin dir.
    78     $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
    78   $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
    79     # Only continue if this object file hasn't been processed already. This lets the first found
    79   # Only continue if this object file hasn't been processed already. This lets the first found
    80     # source file override any other with the same name.
    80   # source file override any other with the same name.
    81     ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
    81   ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
    82         $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
    82     $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
    83         ifeq (,$$(filter %.s,$2))
    83     ifeq (,$$(filter %.s,$2))
    84           # And this is the dependency file for this obj file.
    84       # And this is the dependency file for this obj file.
    85           $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
    85       $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
    86           # Include previously generated dependency information. (if it exists)
    86       # Include previously generated dependency information. (if it exists)
    87           -include $$($1_$2_DEP)
    87       -include $$($1_$2_DEP)
    88 
    88 
    89           ifeq ($(COMPILER_TYPE),CL)
    89       ifeq ($(COMPILER_TYPE),CL)
    90               $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
    90         $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
    91                                      -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
    91             -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
    92           endif
    92       endif
    93         endif
    93     endif
    94 
    94 
    95         $$($1_$2_OBJ) : $2
    95     $$($1_$2_OBJ) : $2
    96         ifeq ($(COMPILER_TYPE),CC)
    96         ifeq ($(COMPILER_TYPE),CC)
    97 		$$(call COMPILING_MSG,$2,$$($1_TARGET))
    97 	  $$(call COMPILING_MSG,$2,$$($1_TARGET))
    98           # The Sun studio compiler doesn't output the full path to the object file in the
    98           # The Sun studio compiler doesn't output the full path to the object file in the
    99           # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
    99           # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
   100           ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
   100           ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
   101 		$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
   101 	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
   102 		$(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
   102 	    $(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
   103           else
   103           else
   104 		$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
   104 	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
   105         endif
   105           endif
   106         endif
   106         endif
   107         # The Visual Studio compiler lacks a feature for generating make dependencies, but by
   107         # The Visual Studio compiler lacks a feature for generating make dependencies, but by
   108         # setting -showIncludes, all included files are printed. These are filtered out and 
   108         # setting -showIncludes, all included files are printed. These are filtered out and
   109         # parsed into make dependences.
   109         # parsed into make dependences.
   110         ifeq ($(COMPILER_TYPE),CL)
   110         ifeq ($(COMPILER_TYPE),CL)
   111 		($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
   111 	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
   112 			$(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
   112 	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
   113 			| $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
   113 	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
   114 			&& exit `cat $$($1_$2_DEP).exitvalue`
   114 	      && exit `cat $$($1_$2_DEP).exitvalue`
   115 		$(RM) $$($1_$2_DEP).exitvalue
   115 	  $(RM) $$($1_$2_DEP).exitvalue
   116 		($(ECHO) $$@: \\ \
   116 	  ($(ECHO) $$@: \\ \
   117 		 && $(SED) -e '/^Note: including file:/!d' \
   117 	  && $(SED) -e '/^Note: including file:/!d' \
   118 			-e 's|Note: including file: *||' \
   118 	      -e 's|Note: including file: *||' \
   119 			-e 's|\\|/|g' \
   119 	      -e 's|\\|/|g' \
   120 			-e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
   120 	      -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
   121 			-e '/$(subst /,\/,$(TOPDIR))/!d' \
   121 	      -e '/$(subst /,\/,$(TOPDIR))/!d' \
   122 			-e 's|$$$$| \\|g' \
   122 	      -e 's|$$$$| \\|g' \
   123 			$$($1_$2_DEP).raw) > $$($1_$2_DEP)
   123 	      $$($1_$2_DEP).raw) > $$($1_$2_DEP)
   124         endif
   124         endif
   125     endif
   125   endif
   126 endef
   126 endef
   127 
   127 
   128 define SetupNativeCompilation
   128 define SetupNativeCompilation
   129     # param 1 is for example BUILD_MYPACKAGE
   129   # param 1 is for example BUILD_MYPACKAGE
   130     # param 2,3,4,5,6,7,8 are named args.
   130   # param 2,3,4,5,6,7,8 are named args.
   131     #    SRC one or more directory roots to scan for C/C++ files.
   131   #   SRC one or more directory roots to scan for C/C++ files.
   132     #    LANG C or C++
   132   #   LANG C or C++
   133     #    CFLAGS the compiler flags to be used, used both for C and C++.
   133   #   CFLAGS the compiler flags to be used, used both for C and C++.
   134     #    CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
   134   #   CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
   135     #    LDFLAGS the linker flags to be used, used both for C and C++.
   135   #   LDFLAGS the linker flags to be used, used both for C and C++.
   136     #    LDFLAGS_SUFFIX the linker flags to be added last on the commandline
   136   #   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
   137     #        typically the libraries linked to.
   137   #       typically the libraries linked to.
   138     #    ARFLAGS the archiver flags to be used
   138   #   ARFLAGS the archiver flags to be used
   139     #    OBJECT_DIR the directory where we store the object files
   139   #   OBJECT_DIR the directory where we store the object files
   140     #    LIBRARY the resulting library file
   140   #   LIBRARY the resulting library file
   141     #    PROGRAM the resulting exec file
   141   #   PROGRAM the resulting exec file
   142     #    INCLUDES only pick source from these directories
   142   #   INCLUDES only pick source from these directories
   143     #    EXCLUDES do not pick source from these directories
   143   #   EXCLUDES do not pick source from these directories
   144     #    INCLUDE_FILES only compile exactly these files!
   144   #   INCLUDE_FILES only compile exactly these files!
   145     #    EXCLUDE_FILES with these names
   145   #   EXCLUDE_FILES with these names
   146     #    VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
   146   #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
   147     #    RC_FLAGS flags for RC.
   147   #   RC_FLAGS flags for RC.
   148     #    MAPFILE mapfile
   148   #   MAPFILE mapfile
   149     #    REORDER reorder file
   149   #   REORDER reorder file
   150     #    DEBUG_SYMBOLS add debug symbols (if configured on)
   150   #   DEBUG_SYMBOLS add debug symbols (if configured on)
   151     #    CC the compiler to use, default is $(CC)
   151   #   CC the compiler to use, default is $(CC)
   152     #    LDEXE the linker to use for linking executables, default is $(LDEXE)
   152   #   LDEXE the linker to use for linking executables, default is $(LDEXE)
   153     #    OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
   153   #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
   154     $(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))
   154   $(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))
   155     $(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))
   155   $(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))
   156     $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
   156   $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
   157 
   157 
   158     ifneq (,$$($1_BIN))
   158   ifneq (,$$($1_BIN))
   159         $$(error BIN has been replaced with OBJECT_DIR)
   159     $$(error BIN has been replaced with OBJECT_DIR)
   160     endif
   160   endif
   161 
   161 
   162     ifneq (,$$($1_LIB))
   162   ifneq (,$$($1_LIB))
   163         $$(error LIB has been replaced with LIBRARY)
   163     $$(error LIB has been replaced with LIBRARY)
   164     endif
   164   endif
   165 
   165 
   166     ifneq (,$$($1_EXE))
   166   ifneq (,$$($1_EXE))
   167         $$(error EXE has been replaced with PROGRAM)
   167     $$(error EXE has been replaced with PROGRAM)
   168     endif
   168   endif
   169 
   169 
   170     ifneq (,$$($1_LIBRARY))
   170   ifneq (,$$($1_LIBRARY))
   171         ifeq (,$$($1_OUTPUT_DIR))
   171     ifeq (,$$($1_OUTPUT_DIR))
   172             $$(error LIBRARY requires OUTPUT_DIR)
   172       $$(error LIBRARY requires OUTPUT_DIR)
   173         endif
   173     endif
   174 
   174 
   175         ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
   175     ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
   176             $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
   176       $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
   177         endif
   177     endif
   178 
   178 
   179         ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
   179     ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
   180             $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
   180       $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
   181         endif
   181     endif
   182 
   182 
   183         ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
   183     ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
   184             $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
   184       $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
   185         endif
   185     endif
   186 
   186 
   187         $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
   187     $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
   188         $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
   188     $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
   189 
   189 
   190     endif
   190   endif
   191 
   191 
   192     ifneq (,$$($1_STATIC_LIBRARY))
   192   ifneq (,$$($1_STATIC_LIBRARY))
   193         ifeq (,$$($1_OUTPUT_DIR))
   193     ifeq (,$$($1_OUTPUT_DIR))
   194             $$(error STATIC_LIBRARY requires OUTPUT_DIR)
   194       $$(error STATIC_LIBRARY requires OUTPUT_DIR)
   195         endif
   195     endif
   196 
   196 
   197         ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
   197     ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
   198             $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
   198       $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
   199         endif
   199     endif
   200 
   200 
   201         ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
   201     ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
   202             $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
   202       $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
   203         endif
   203     endif
   204 
   204 
   205         ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
   205     ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
   206             $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
   206       $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
   207         endif
   207     endif
   208 
   208 
   209         $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
   209     $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
   210         $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
   210     $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
   211     endif
   211   endif
   212 
   212 
   213     ifneq (,$$($1_PROGRAM))
   213   ifneq (,$$($1_PROGRAM))
   214         ifeq (,$$($1_OUTPUT_DIR))
   214     ifeq (,$$($1_OUTPUT_DIR))
   215             $$(error PROGRAM requires OUTPUT_DIR)
   215       $$(error PROGRAM requires OUTPUT_DIR)
   216         endif
   216     endif
   217 
   217 
   218         ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
   218     ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
   219             $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
   219       $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
   220         endif
   220     endif
   221 
   221 
   222         ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
   222     ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
   223             $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
   223       $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
   224         endif
   224     endif
   225 
   225 
   226         $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
   226     $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
   227         $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
   227     $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
   228 
   228 
   229     endif
   229   endif
   230 
   230 
   231     ifeq (,$$($1_TARGET))
   231   ifeq (,$$($1_TARGET))
   232         $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
   232     $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
   233     endif
   233   endif
   234 
   234 
   235     ifeq (,$$($1_LANG))
   235   ifeq (,$$($1_LANG))
   236         $$(error You have to specify LANG for native compilation $1)
   236     $$(error You have to specify LANG for native compilation $1)
   237     endif
   237   endif
   238     ifeq (C,$$($1_LANG))
   238   ifeq (C,$$($1_LANG))
   239         ifeq ($$($1_LDEXE),)
   239     ifeq ($$($1_LDEXE),)
   240 	    $1_LDEXE:=$(LDEXE)
   240       $1_LDEXE:=$(LDEXE)
   241         endif
   241     endif
   242 	$1_LD:=$(LD)
   242     $1_LD:=$(LD)
       
   243   else
       
   244     ifeq (C++,$$($1_LANG))
       
   245       $1_LD:=$(LDCXX)
       
   246       $1_LDEXE:=$(LDEXECXX)
   243     else
   247     else
   244        ifeq (C++,$$($1_LANG))
   248       $$(error Unknown native language $$($1_LANG) for $1)
   245            $1_LD:=$(LDCXX)
   249     endif
   246 	   $1_LDEXE:=$(LDEXECXX)
   250   endif
   247        else
   251 
   248            $$(error Unknown native language $$($1_LANG) for $1)
   252   ifeq ($$($1_CC),)
   249        endif
   253     $1_CC:=$(CC)
   250     endif
   254   endif
   251 
   255 
   252     ifeq ($$($1_CC),)
   256   # Make sure the dirs exist.
   253         $1_CC:=$(CC)
   257   $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
   254     endif
   258   $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
   255 
   259 
   256     # Make sure the dirs exist.
   260   # Find all files in the source trees. Sort to remove duplicates.
   257     $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
   261   $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
   258     $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
   262   # Extract the C/C++ files.
   259 
   263   $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
   260     # Find all files in the source trees. Sort to remove duplicates.
   264   $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
   261     $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
   265   ifneq ($$($1_EXCLUDE_FILES),)
   262     # Extract the C/C++ files.
   266     $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
   263     $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
   267   endif
   264     $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
   268   $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
   265     ifneq ($$($1_EXCLUDE_FILES),)
   269   ifneq (,$$(strip $$($1_INCLUDE_FILES)))
   266         $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
   270     $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
   267     endif
   271   endif
   268     $1_SRCS     := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
   272   ifeq (,$$($1_SRCS))
   269     ifneq (,$$(strip $$($1_INCLUDE_FILES)))
   273     $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
   270         $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
   274   endif
   271     endif
   275   # There can be only a single bin dir root, no need to foreach over the roots.
   272     ifeq (,$$($1_SRCS))
   276   $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
   273         $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
   277   # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
   274     endif
   278   # and we have a list of all existing object files: $$($1_BINS)
   275     # There can be only a single bin dir root, no need to foreach over the roots.
   279 
   276     $1_BINS     := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
   280   # Prepend the source/bin path to the filter expressions. Then do the filtering.
   277     # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
   281   ifneq ($$($1_INCLUDES),)
   278     # and we have a list of all existing object files: $$($1_BINS)
   282     $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
   279 
   283     $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
   280     # Prepend the source/bin path to the filter expressions. Then do the filtering.
   284   endif
   281     ifneq ($$($1_INCLUDES),)
   285   ifneq ($$($1_EXCLUDES),)
   282         $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
   286     $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
   283         $1_SRCS         := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
   287     $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
   284     endif
   288   endif
   285     ifneq ($$($1_EXCLUDES),)
   289 
   286         $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
   290   # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
   287         $1_SRCS         := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
   291   # a reproducable order on the input files to the linker).
   288     endif
   292   $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
   289 
   293   # Are there too many object files on disk? Perhaps because some source file was removed?
   290     # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
   294   $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
   291     # a reproducable order on the input files to the linker).
   295   # Clean out the superfluous object files.
   292     $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
   296   ifneq ($$($1_SUPERFLUOUS_OBJS),)
   293     # Are there too many object files on disk? Perhaps because some source file was removed?
   297     $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
   294     $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
   298   endif
   295     # Clean out the superfluous object files.
   299 
   296     ifneq ($$($1_SUPERFLUOUS_OBJS),)
   300   # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
   297         $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
   301   $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
   298     endif
   302   ifneq ($(DEBUG_LEVEL),release)
   299 
   303     # Pickup extra debug dependent variables for CFLAGS
   300     # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
   304     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
   301     $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
   305     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
   302     ifneq ($(DEBUG_LEVEL),release)
   306     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
   303         # Pickup extra debug dependent variables for CFLAGS
   307   else
   304         $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
   308     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
   305         $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
   309     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
   306         $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
   310     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
   307     else
   311   endif
   308         $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
   312 
   309         $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
   313   # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
   310         $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
   314   $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
   311     endif
   315   ifneq ($(DEBUG_LEVEL),release)
   312 
   316     # Pickup extra debug dependent variables for CXXFLAGS
   313     # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
   317     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
   314     $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
   318     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
   315     ifneq ($(DEBUG_LEVEL),release)
   319     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
   316         # Pickup extra debug dependent variables for CXXFLAGS
   320   else
   317         $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
   321     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
   318         $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
   322     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
   319         $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
   323     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
   320     else
   324   endif
   321         $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
   325 
   322         $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
   326   ifneq (,$$($1_DEBUG_SYMBOLS))
   323         $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
   327     ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   324     endif
   328       ifdef OPENJDK
   325 
   329         # Always add debug symbols
   326     ifneq (,$$($1_DEBUG_SYMBOLS))	
   330         $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
   327         ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   331         $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
   328 	    ifdef OPENJDK
   332       else
   329 	        # Always add debug symbols
   333         # Programs don't get the debug symbols added in the old build. It's not clear if
   330                 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
   334         # this is intentional.
   331                 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
   335         ifeq ($$($1_PROGRAM),)
   332 	    else
   336           $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
   333                 # Programs don't get the debug symbols added in the old build. It's not clear if
   337           $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
   334                 # this is intentional.
   338         endif
   335                 ifeq ($$($1_PROGRAM),)
   339       endif
   336                     $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
   340     endif
   337                     $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
   341   endif
   338                 endif
   342 
   339             endif
   343   ifeq ($$($1_CXXFLAGS),)
   340         endif
   344     $1_CXXFLAGS:=$$($1_CFLAGS)
   341     endif
   345   endif
   342 
   346   ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
   343     ifeq ($$($1_CXXFLAGS),)
   347     $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
   344         $1_CXXFLAGS:=$$($1_CFLAGS)
   348   endif
   345     endif
   349 
   346     ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
   350   ifneq (,$$($1_REORDER))
   347         $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
   351     $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
   348     endif
   352     $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
   349 
   353   endif
   350     ifneq (,$$($1_REORDER))
   354 
   351           $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
   355   ifeq (NONE, $$($1_OPTIMIZATION))
   352           $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
   356     $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
   353     endif
   357     $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
   354 
   358   else ifeq (LOW, $$($1_OPTIMIZATION))
   355     ifeq (NONE, $$($1_OPTIMIZATION))
   359     $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
   356         $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
   360     $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
   357         $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
   361   else ifeq (HIGH, $$($1_OPTIMIZATION))
   358     else ifeq (LOW, $$($1_OPTIMIZATION))
   362     $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
   359         $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
   363     $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
   360         $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
   364   else ifeq (HIGHEST, $$($1_OPTIMIZATION))
   361     else ifeq (HIGH, $$($1_OPTIMIZATION))
   365     $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
   362         $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
   366     $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
   363         $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
   367   else ifneq (, $$($1_OPTIMIZATION))
   364     else ifeq (HIGHEST, $$($1_OPTIMIZATION))
   368     $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
   365         $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
   369   endif
   366         $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
   370 
   367     else ifneq (, $$($1_OPTIMIZATION))
   371   # Now call add_native_source for each source file we are going to compile.
   368         $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
   372   $$(foreach p,$$($1_SRCS), \
   369     endif
   373       $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
   370 
   374           $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
   371     # Now call add_native_source for each source file we are going to compile.
   375           $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
   372     $$(foreach p,$$($1_SRCS),\
   376 
   373         $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR),\
   377   # On windows we need to create a resource file
   374                         $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC),\
   378   ifeq ($(OPENJDK_TARGET_OS), windows)
   375 			$$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
   379     ifneq (,$$($1_VERSIONINFO_RESOURCE))
   376 
   380       $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
   377     # On windows we need to create a resource file
   381       $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
   378     ifeq ($(OPENJDK_TARGET_OS), windows)
       
   379         ifneq (,$$($1_VERSIONINFO_RESOURCE))
       
   380             $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
       
   381             $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
       
   382 		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
   382 		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
   383         endif
   383     endif
   384         ifneq (,$$($1_MANIFEST))
   384     ifneq (,$$($1_MANIFEST))
   385             $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
   385       $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
   386             IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
   386       IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
   387             $$($1_GEN_MANIFEST): $$($1_MANIFEST)
   387       $$($1_GEN_MANIFEST): $$($1_MANIFEST)
   388 		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
   388 		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
   389         endif
   389     endif
   390     endif
   390   endif
   391 
   391 
   392     # mapfile doesnt seem to be implemented on macosx (yet??)
   392   # mapfile doesnt seem to be implemented on macosx (yet??)
   393     ifneq ($(OPENJDK_TARGET_OS),macosx)
   393   ifneq ($(OPENJDK_TARGET_OS),macosx)
   394     ifneq ($(OPENJDK_TARGET_OS),windows)
   394     ifneq ($(OPENJDK_TARGET_OS),windows)
   395         $1_REAL_MAPFILE:=$$($1_MAPFILE)
   395       $1_REAL_MAPFILE:=$$($1_MAPFILE)
   396         ifneq (,$$($1_REORDER))
   396       ifneq (,$$($1_REORDER))
   397             $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
   397         $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
   398 
   398 
   399             $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
   399         $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
   400 		$$(MKDIR) -p $$(@D)
   400 		$$(MKDIR) -p $$(@D)
   401 		$$(CP) $$($1_MAPFILE) $$@.tmp
   401 		$$(CP) $$($1_MAPFILE) $$@.tmp
   402 		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
   402 		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
   403 		$$(MV) $$@.tmp $$@
   403 		$$(MV) $$@.tmp $$@
   404         endif
   404       endif
   405     endif
   405     endif
   406     endif
   406   endif
   407 
   407 
   408     # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
   408   # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
   409     # for LDFLAGS and LDFLAGS_SUFFIX
   409   # for LDFLAGS and LDFLAGS_SUFFIX
   410     $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
   410   $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
   411     $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
   411   $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
   412     ifneq (,$$($1_REAL_MAPFILE))
   412   ifneq (,$$($1_REAL_MAPFILE))
   413         $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
   413     $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
   414     endif
   414   endif
   415 
   415 
   416     $1 := $$($1_TARGET)
   416   $1 := $$($1_TARGET)
   417     ifneq (,$$($1_LIBRARY))
   417   ifneq (,$$($1_LIBRARY))
   418         # Generating a dynamic library.
   418     # Generating a dynamic library.
   419         $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
   419     $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
       
   420     ifeq ($(OPENJDK_TARGET_OS), windows)
       
   421       $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
       
   422     endif
       
   423 
       
   424     $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
       
   425 
       
   426     ifneq (,$$($1_DEBUG_SYMBOLS))
       
   427       ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   420         ifeq ($(OPENJDK_TARGET_OS), windows)
   428         ifeq ($(OPENJDK_TARGET_OS), windows)
   421             $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
   429           $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
   422         endif
   430               "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
   423 
   431         endif
   424         $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)        
   432 
   425 
   433         ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
   426         ifneq (,$$($1_DEBUG_SYMBOLS))
   434           $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
   427             ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   435 		$(CP) $$< $$@
   428                 ifeq ($(OPENJDK_TARGET_OS), windows)
   436         endif
   429                     $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
   437 
   430 				      "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
   438         ifeq ($(OPENJDK_TARGET_OS), solaris)
   431                 endif
   439           # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
   432 
   440           # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
   433                 ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
   441           # empty section headers until a fixed $(OBJCOPY) is available.
   434                     $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
   442           # An empty section header has sh_addr == 0 and sh_size == 0.
   435 			$(CP) $$< $$@
   443           # This problem has only been seen on Solaris X64, but we call this tool
   436                 endif
   444           # on all Solaris builds just in case.
   437 
   445           #
   438                 ifeq ($(OPENJDK_TARGET_OS), solaris)
   446           # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
   439                     # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
   447           # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
   440                     # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
   448           $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
   441                     # empty section headers until a fixed $(OBJCOPY) is available.
   449               $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
   442                     # An empty section header has sh_addr == 0 and sh_size == 0.
   450 		$(RM) $$@
   443                     # This problem has only been seen on Solaris X64, but we call this tool
   451 		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
   444                     # on all Solaris builds just in case.
   452 		$(OBJCOPY) --only-keep-debug $$< $$@
   445                     #
   453 		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
   446                     # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
   454         else # not solaris
   447                     # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
   455           $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
   448                     $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
   456 		$(RM) $$@
   449 					$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
   457 		$(OBJCOPY) --only-keep-debug $$< $$@
   450 			$(RM) $$@
   458 		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
   451 			$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
   459         endif # Touch to not retrigger rule on rebuild
   452 			$(OBJCOPY) --only-keep-debug $$< $$@
   460 		$(TOUCH) $$@
   453 			$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
   461 
   454                 else # not solaris
   462         ifeq ($(ZIP_DEBUGINFO_FILES), true)
   455                     $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
   463           $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
   456 			$(RM) $$@
   464 
   457 			$(OBJCOPY) --only-keep-debug $$< $$@
   465           ifeq ($(OPENJDK_TARGET_OS), windows)
   458 			$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
   466             $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
   459                 endif # Touch to not retrigger rule on rebuild
   467 		$(CD) $$($1_OBJECT_DIR) \
   460 			$(TOUCH) $$@
   468 		&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
   461 
   469           else
   462                 ifeq ($(ZIP_DEBUGINFO_FILES), true)
   470             $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
   463                     $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
   471                 $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
   464 
   472 		$(CD) $$($1_OBJECT_DIR) \
   465                     ifeq ($(OPENJDK_TARGET_OS), windows)
   473 		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
   466                         $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
   474           endif
   467 				$(CD) $$($1_OBJECT_DIR) \
   475         else
   468 				&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
   476           ifeq ($(OPENJDK_TARGET_OS), windows)
   469                     else
   477             $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
   470                         $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
   478                 $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
   471 					$$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
   479           else
   472 				$(CD) $$($1_OBJECT_DIR) \
   480             $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
   473 				&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo 
   481           endif
   474                     endif
   482         endif
   475                 else
   483       endif
   476                     ifeq ($(OPENJDK_TARGET_OS), windows)
   484     endif
   477                         $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
   485 
   478 			      $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
   486     $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
   479                     else
   487 	$$(call LINKING_MSG,$$($1_BASENAME))
   480                         $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
   488 	$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
   481                     endif
   489 	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
   482                 endif
   490 	$$($1_EXTRA_LDFLAGS_SUFFIX)
   483             endif
   491 
   484         endif
   492   endif
   485 
   493 
   486         $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
   494   ifneq (,$$($1_STATIC_LIBRARY))
   487 		$$(call LINKING_MSG,$$($1_BASENAME))
   495     # Generating a static library, ie object file archive.
   488 		$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
   496     $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
   489 		$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
   497 	$$(call ARCHIVING_MSG,$$($1_LIBRARY))
   490 		$$($1_EXTRA_LDFLAGS_SUFFIX)
   498 	$(AR) $$($1_AR_FLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
   491 
   499 	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
   492     endif
   500   endif
   493 
   501 
   494     ifneq (,$$($1_STATIC_LIBRARY))
   502   ifneq (,$$($1_PROGRAM))
   495         # Generating a static library, ie object file archive.
   503     # A executable binary has been specified, setup the target for it.
   496         $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
   504     ifneq (,$$($1_DEBUG_SYMBOLS))
   497 	        $$(call ARCHIVING_MSG,$$($1_LIBRARY))
   505       ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   498 	        $(AR) $$($1_AR_FLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
   506         ifeq ($(OPENJDK_TARGET_OS), windows)
   499 			$$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
   507           $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
   500     endif
   508               "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
   501 
   509         endif
   502     ifneq (,$$($1_PROGRAM))
   510 
   503         # A executable binary has been specified, setup the target for it.
   511         ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
   504         ifneq (,$$($1_DEBUG_SYMBOLS))
   512           $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
   505             ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
   513 		$(CP) $$< $$@
   506                 ifeq ($(OPENJDK_TARGET_OS), windows)
   514         endif
   507                     $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
   515 
   508 				      "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
   516         ifeq ($(OPENJDK_TARGET_OS), solaris)
   509                 endif
   517           # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
   510 
   518           # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
   511                 ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
   519           # empty section headers until a fixed $(OBJCOPY) is available.
   512                     $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
   520           # An empty section header has sh_addr == 0 and sh_size == 0.
   513 			$(CP) $$< $$@
   521           # This problem has only been seen on Solaris X64, but we call this tool
   514                 endif
   522           # on all Solaris builds just in case.
   515 
   523           #
   516                 ifeq ($(OPENJDK_TARGET_OS), solaris)
   524           # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
   517                     # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
   525           # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
   518                     # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
   526           $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
   519                     # empty section headers until a fixed $(OBJCOPY) is available.
   527               $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
   520                     # An empty section header has sh_addr == 0 and sh_size == 0.
   528 		$(RM) $$@
   521                     # This problem has only been seen on Solaris X64, but we call this tool
   529 		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
   522                     # on all Solaris builds just in case.
   530 		$(OBJCOPY) --only-keep-debug $$< $$@
   523                     #
   531 		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
   524                     # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
   532         else # not solaris
   525                     # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
   533           $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
   526                     $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
   534 		$(RM) $$@
   527 					$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
   535 		$(OBJCOPY) --only-keep-debug $$< $$@
   528 			$(RM) $$@
   536 		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
   529 			$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
   537         endif
   530 			$(OBJCOPY) --only-keep-debug $$< $$@
   538 		$(TOUCH) $$@
   531 			$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
   539 
   532                 else # not solaris
   540         ifeq ($(ZIP_DEBUGINFO_FILES), true)
   533                     $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
   541           $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
   534 			$(RM) $$@
   542 
   535 			$(OBJCOPY) --only-keep-debug $$< $$@
   543           ifeq ($(OPENJDK_TARGET_OS), windows)
   536 			$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
   544             $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
   537                 endif
   545 		$(CD) $$($1_OBJECT_DIR) \
   538 			$(TOUCH) $$@
   546 		&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
   539 
   547           else
   540                 ifeq ($(ZIP_DEBUGINFO_FILES), true)
   548             $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
   541                     $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
   549                 $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
   542 
   550 		$(CD) $$($1_OBJECT_DIR) \
   543                     ifeq ($(OPENJDK_TARGET_OS), windows)
   551 		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
   544                         $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
   552           endif
   545 				$(CD) $$($1_OBJECT_DIR) \
   553         else
   546 				&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
   554           ifeq ($(OPENJDK_TARGET_OS), windows)
   547                     else
   555             $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
   548                         $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
   556                 $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
   549 					$$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
   557           else
   550 				$(CD) $$($1_OBJECT_DIR) \
   558             $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
   551 				&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo 
   559           endif
   552                     endif
   560         endif
   553                 else
   561       endif
   554                     ifeq ($(OPENJDK_TARGET_OS), windows)
   562     endif
   555                         $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
   563 
   556 			      $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
   564     $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
   557                     else
   565 
   558                         $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
   566     $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
   559                     endif
   567 	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
   560                 endif
   568 	$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
   561             endif
   569 	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
   562         endif
   570 	$$($1_EXTRA_LDFLAGS_SUFFIX)
   563 
       
   564         $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
       
   565 
       
   566         $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
       
   567 	    	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
       
   568 		$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
       
   569 			$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
       
   570 			$$($1_EXTRA_LDFLAGS_SUFFIX)
       
   571         ifneq (,$$($1_GEN_MANIFEST))
   571         ifneq (,$$($1_GEN_MANIFEST))
   572 		$(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
   572 	  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
   573         endif
   573         endif
   574         # This only works if the openjdk_codesign identity is present on the system. Let
   574         # This only works if the openjdk_codesign identity is present on the system. Let
   575         # silently fail otherwise.
   575         # silently fail otherwise.
   576         ifneq (,$(CODESIGN))
   576         ifneq (,$(CODESIGN))
   577             ifneq (,$$($1_CODESIGN))
   577           ifneq (,$$($1_CODESIGN))
   578 		$(CODESIGN) -s openjdk_codesign $$@
   578 	    $(CODESIGN) -s openjdk_codesign $$@
   579             endif
   579           endif
   580         endif
   580         endif
   581     endif
   581   endif
   582 endef
   582 endef