equal
deleted
inserted
replaced
139 WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).dso) |
139 WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).dso) |
140 WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).dso |
140 WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).dso |
141 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_DSO)),) |
141 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_DSO)),) |
142 IMPORTLIBTARGET_DSO:=$(TMP_IMPORTLIBTARGET_ROOT).dso |
142 IMPORTLIBTARGET_DSO:=$(TMP_IMPORTLIBTARGET_ROOT).dso |
143 IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso |
143 IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso |
144 $(eval $(BUILDMARKER_IMPORTLIBTARGET_DSO):=1) |
|
145 endif |
144 endif |
146 |
145 |
147 # ABIv1 .lib (for specific builds, toolchains and host OS platforms only) |
146 # ABIv1 .lib (for specific builds, toolchains and host OS platforms only) |
148 IMPORTLIBTARGET_LIB:= |
147 IMPORTLIBTARGET_LIB:= |
149 IMPORTLIBTARGETVERSIONED_LIB:= |
148 IMPORTLIBTARGETVERSIONED_LIB:= |
154 WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib) |
153 WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib) |
155 WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib |
154 WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib |
156 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),) |
155 ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),) |
157 IMPORTLIBTARGET_LIB:=$(TMP_IMPORTLIBTARGET_ROOT).lib |
156 IMPORTLIBTARGET_LIB:=$(TMP_IMPORTLIBTARGET_ROOT).lib |
158 IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib |
157 IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib |
159 $(eval $(BUILDMARKER_IMPORTLIBTARGET_LIB):=1) |
|
160 endif |
158 endif |
161 endif |
159 endif |
162 endif |
160 endif |
163 endif |
161 endif |
164 |
162 |
249 endif |
247 endif |
250 |
248 |
251 # ABIv2 .dso |
249 # ABIv2 .dso |
252 ifneq ($(IMPORTLIBTARGET_DSO),) # check that we haven't tried to specify this target already |
250 ifneq ($(IMPORTLIBTARGET_DSO),) # check that we haven't tried to specify this target already |
253 |
251 |
|
252 # By Now we're committed to producing a target for this DSO so it's safe to |
|
253 # set the marker that will prevent any further targets from being made. |
|
254 $(eval $(BUILDMARKER_IMPORTLIBTARGET_DSO):=1) |
|
255 |
254 ifneq ($(EXPLICITVERSION),) |
256 ifneq ($(EXPLICITVERSION),) |
255 TARGETS:=$(strip $(TARGETS) $(IMPORTLIBTARGETVERSIONED_DSO)) |
257 TARGETS:=$(strip $(TARGETS) $(IMPORTLIBTARGETVERSIONED_DSO)) |
256 |
258 |
257 # Add this importlibrary to our global targets |
259 # Add this importlibrary to our global targets |
258 LIBRARY:: $(IMPORTLIBTARGETVERSIONED_DSO) |
260 LIBRARY:: $(IMPORTLIBTARGETVERSIONED_DSO) |
324 endif # ifneq ($(EXPORTUNFROZEN),) |
326 endif # ifneq ($(EXPORTUNFROZEN),) |
325 endif # ifneq ($(IMPORTLIBTARGET_DSO),) |
327 endif # ifneq ($(IMPORTLIBTARGET_DSO),) |
326 |
328 |
327 # ABIv1 .lib |
329 # ABIv1 .lib |
328 ifneq ($(IMPORTLIBTARGETVERSIONED_LIB),) # check that we haven't tried to specify this target already |
330 ifneq ($(IMPORTLIBTARGETVERSIONED_LIB),) # check that we haven't tried to specify this target already |
|
331 |
|
332 # By Now we're committed to producing a target for this DSO so it's safe to |
|
333 # set the marker that will prevent any further targets from being made. |
|
334 $(eval $(BUILDMARKER_IMPORTLIBTARGET_LIB):=1) |
329 |
335 |
330 define abiv1_generatelib |
336 define abiv1_generatelib |
331 |
337 |
332 ifeq ($(EXPLICITVERSION),) |
338 ifeq ($(EXPLICITVERSION),) |
333 LIBRARY:: $(IMPORTLIBTARGETVERSIONED_LIB) $(IMPORTLIBTARGET_LIB) |
339 LIBRARY:: $(IMPORTLIBTARGETVERSIONED_LIB) $(IMPORTLIBTARGET_LIB) |