868 ifneq ($(COMPILER_BINDCMD_FILE_FLAG), ) |
868 ifneq ($(COMPILER_BINDCMD_FILE_FLAG), ) |
869 $1_EXTRA_LDFLAGS += $(COMPILER_BINDCMD_FILE_FLAG)$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).loadmap |
869 $1_EXTRA_LDFLAGS += $(COMPILER_BINDCMD_FILE_FLAG)$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).loadmap |
870 endif |
870 endif |
871 |
871 |
872 $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
872 $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
873 $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_CREATE_DEBUGINFO_CMDS) \ |
873 $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_CREATE_DEBUGINFO_CMDS) \ |
874 $$($1_STRIP_CMD) |
874 $$($1_STRIP_CMD) |
875 $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
875 $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
876 $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
876 $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
877 |
877 |
878 $1_LD_OBJ_ARG := $$($1_ALL_OBJS) |
878 $1_LD_OBJ_ARG := $$($1_ALL_OBJS) |
922 # on Windows |
922 # on Windows |
923 $$(call LogInfo, Linking $$($1_BASENAME)) |
923 $$(call LogInfo, Linking $$($1_BASENAME)) |
924 ifeq ($(OPENJDK_TARGET_OS), windows) |
924 ifeq ($(OPENJDK_TARGET_OS), windows) |
925 $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
925 $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
926 $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
926 $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
927 $(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$($1_LIBS) \ |
927 $(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \ |
928 $$($1_EXTRA_LIBS)) \ |
928 $$($1_LIBS) $$($1_EXTRA_LIBS)) \ |
929 | $(GREP) -v "^ Creating library .*\.lib and object .*\.exp" || \ |
929 | $(GREP) -v "^ Creating library .*\.lib and object .*\.exp" || \ |
930 test "$$$$?" = "1" ; \ |
930 test "$$$$?" = "1" ; \ |
931 $$($1_CREATE_DEBUGINFO_CMDS) |
931 $$($1_CREATE_DEBUGINFO_CMDS) |
932 $$($1_STRIP_CMD) |
932 $$($1_STRIP_CMD) |
933 else |
933 else |
934 $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
934 $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
935 $$(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \ |
935 $$(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \ |
936 $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
936 $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
937 $(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$($1_LIBS) \ |
937 $(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \ |
938 $$($1_EXTRA_LIBS)) ; \ |
938 $$($1_LIBS) $$($1_EXTRA_LIBS)) ; \ |
939 $$($1_CREATE_DEBUGINFO_CMDS) |
939 $$($1_CREATE_DEBUGINFO_CMDS) |
940 $$($1_STRIP_CMD) |
940 $$($1_STRIP_CMD) |
941 endif |
941 endif |
942 |
942 |
943 endif |
943 endif |
970 endif |
970 endif |
971 |
971 |
972 ifeq ($$($1_TYPE), EXECUTABLE) |
972 ifeq ($$($1_TYPE), EXECUTABLE) |
973 # A executable binary has been specified, setup the target for it. |
973 # A executable binary has been specified, setup the target for it. |
974 $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
974 $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \ |
975 $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \ |
975 $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \ |
976 $$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \ |
976 $$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \ |
977 $$($1_STRIP_CMD) |
977 $$($1_STRIP_CMD) |
978 $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
978 $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \ |
979 $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
979 $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps) |
980 |
980 |
989 $$(call LogInfo, Linking executable $$($1_BASENAME)) |
989 $$(call LogInfo, Linking executable $$($1_BASENAME)) |
990 $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
990 $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \ |
991 $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
991 $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \ |
992 $(EXE_OUT_OPTION)$$($1_TARGET) \ |
992 $(EXE_OUT_OPTION)$$($1_TARGET) \ |
993 $$($1_ALL_OBJS) $$($1_RES) \ |
993 $$($1_ALL_OBJS) $$($1_RES) \ |
994 $$($1_LIBS) $$($1_EXTRA_LIBS)) |
994 $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS)) |
995 ifeq ($(OPENJDK_TARGET_OS), windows) |
995 ifeq ($(OPENJDK_TARGET_OS), windows) |
996 ifneq ($$($1_MANIFEST), ) |
996 ifneq ($$($1_MANIFEST), ) |
997 $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1 |
997 $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1 |
998 endif |
998 endif |
999 endif |
999 endif |