# HG changeset patch
# User yiluzhu
# Date 1263555905 0
# Node ID f0800c70aa13ab47b864eab93dc4f6f8456762a7
# Parent 6d26dad2041814dbea0bf18fb00b9ef8456b8469# Parent 52e5ae7bfcfe62f46af5c5e4ec09bf803ee9383a
Merge
diff -r 6d26dad20418 -r f0800c70aa13 sbsv2/raptor/lib/flm/tools.xml
--- a/sbsv2/raptor/lib/flm/tools.xml Fri Jan 15 11:38:40 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tools.xml Fri Jan 15 11:45:05 2010 +0000
@@ -43,6 +43,7 @@
+
diff -r 6d26dad20418 -r f0800c70aa13 sbsv2/raptor/lib/flm/tools2exe.flm
--- a/sbsv2/raptor/lib/flm/tools2exe.flm Fri Jan 15 11:38:40 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tools2exe.flm Fri Jan 15 11:45:05 2010 +0000
@@ -52,7 +52,7 @@
define tools2linkexe
$(EXETARGET): $(OBJECTFILES) $(STATICLIBS)
$(call startrule,tools2linkexe) \
- $(LINKER) $(CFLAGS) $(LFLAGS) $(OPT.O)"$(EXETARGET)" $(call dblquote,$(OBJECTFILES)) $(LLIBS) \
+ $(LINKER) $(CFLAGS) $(LFLAGS) $(OPT.O)"$(EXETARGET)" $(call dblquote,$(OBJECTFILES)) $(LLIBS) $(LINKER_OPTIONS) \
$(if $(SAVESPACE),; $(GNURM) -rf $(OUTPUTPATH); true,) \
$(call endrule,tools2linkexe)