diff -r ccd52fece6ff -r 0757c2976f96 sbsv2/raptor/lib/flm/e32abiv2.flm --- a/sbsv2/raptor/lib/flm/e32abiv2.flm Mon Nov 29 15:29:25 2010 +0800 +++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Mon Nov 29 15:37:06 2010 +0800 @@ -371,8 +371,8 @@ # If unfrozen, .lib files are based on the .def file generated by the final postlink $(IMPORTLIBTARGETVERSIONED_LIB): $(if $(EXPORTUNFROZEN),$(E32TARGET),$(PREPPEDDEFFILE)) $(call startrule,importlibversioned_abiv1) \ - if [ -f "$(EPOCROOT)/epoc32/tools/def2dll.pl" -a -f "$(if $(EXPORTUNFROZEN),$(call dblquote,$(GENERATED_DEFFILE)),$(PREPPEDDEFFILE))" ]; then \ - $(PERL) $(EPOCROOT)/epoc32/tools/def2dll.pl \ + if [ -f "$(if $(EXPORTUNFROZEN),$(call dblquote,$(GENERATED_DEFFILE)),$(PREPPEDDEFFILE))" ]; then \ + $(DEF2DLLTOOL) \ --path=$(IMPORTLIBPATH) \ --bldpath=$(INTERMEDIATEPATH) \ --import=$(notdir $(basename $(IMPORTLIBTARGETVERSIONED_LIB))) \ @@ -384,7 +384,7 @@ ifeq ($(EXPLICITVERSION),) $(IMPORTLIBTARGET_LIB): $(IMPORTLIBTARGETVERSIONED_LIB) $(call startrule,importlibtarget_abiv1) \ - if [ -f $(EPOCROOT)/epoc32/tools/def2dll.pl ]; then $(GNUCP) "$$<" "$$@" ; fi \ + $(GNUCP) "$$<" "$$@" \ $(call endrule,importlibtarget_abiv1) endif endef @@ -448,7 +448,7 @@ --definput=$$(call dblquote,$(DEFFILE)) \ --dump=a $(if $(POSTLINKER_SUPPORTS_ASMTYPE),$(POSTLINKER_ASM_OPTION),) \ --output=$(call dblquote,$(EXPTARGETASMFILE)) && \ - $(ASM) $(TARGET_ARCH_OPTION) $(AAPCS_OPTION) $(ASM_OUTPUT_OPTION) $$(call dblquote, $$@) $(EXPTARGETASMFILE) \ + $(ASM) $(ASM_FLAGS) $(TARGET_ARCH_OPTION) $(AAPCS_OPTION) $(ASM_OUTPUT_OPTION) $$(call dblquote, $$@) $(EXPTARGETASMFILE) \ $(call endrule,expgen) endef