equal
deleted
inserted
replaced
54 $(LIB_LOCATION)/$(SALIB_NAME) |
54 $(LIB_LOCATION)/$(SALIB_NAME) |
55 ifeq ($(PLATFORM), windows) |
55 ifeq ($(PLATFORM), windows) |
56 IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \ |
56 IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \ |
57 $(LIB_LOCATION)/$(SAPDB_NAME) |
57 $(LIB_LOCATION)/$(SAPDB_NAME) |
58 endif |
58 endif |
|
59 ifneq ($(OBJCOPY),) |
|
60 # the import JDK may not contain .debuginfo files |
|
61 ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DEBUGINFO_NAME)),) |
|
62 IMPORT_LIST += $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME) |
|
63 endif |
|
64 endif |
59 endif # INCLUDE_SA |
65 endif # INCLUDE_SA |
60 |
66 |
61 |
67 |
62 ifeq ($(INCLUDE_SA), true) |
68 ifeq ($(INCLUDE_SA), true) |
63 # The Serviceability Agent is built in the Hotspot workspace. |
69 # The Serviceability Agent is built in the Hotspot workspace. |
77 $(install-import-file) |
83 $(install-import-file) |
78 |
84 |
79 $(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME) |
85 $(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME) |
80 $(install-import-file) |
86 $(install-import-file) |
81 endif # windows |
87 endif # windows |
|
88 |
|
89 ifneq ($(OBJCOPY),) |
|
90 $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DEBUGINFO_NAME) |
|
91 $(install-import-file) |
|
92 endif |
82 endif # INCLUDE_SA |
93 endif # INCLUDE_SA |
83 |
94 |
84 all: $(IMPORT_LIST) |
95 all: $(IMPORT_LIST) |
85 |
96 |
86 clean clobber:: |
97 clean clobber:: |