--- a/sbsv2/raptor/lib/flm/e32abiv2.flm Fri Apr 30 13:26:13 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Fri Apr 30 16:07:47 2010 +0100
@@ -170,13 +170,12 @@
IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso
endif
- # ABIv1 .lib (for specific builds, toolchains and host OS platforms only)
+ # ABIv1 .lib (for specific kits and toolchains only)
IMPORTLIBTARGET_LIB:=
IMPORTLIBTARGETVERSIONED_LIB:=
BUILDMARKER_IMPORTLIBTARGET_LIB:=TARGET_$(subst :,,$(VER_E32IMPORTLIBBASE)).lib
- # Only for builds that require and support them, and only on windows
- ifeq ($(OSTYPE),cygwin)
- ifeq ($(GENERATE_ABIV1_IMPLIBS),1)
+ # Only for kits that require and tools that support them
+ ifneq ($(SUPPORTS_ABIV1_IMPLIBS),)
WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib)
WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib
ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),)
@@ -184,7 +183,6 @@
IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib
endif
endif
- endif
endif
# Try to make sure that we get the right linkas name