Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fix
authoryiluzhu
Fri, 15 Jan 2010 11:45:05 +0000
branchfix
changeset 111 f0800c70aa13
parent 110 6d26dad20418 (current diff)
parent 109 52e5ae7bfcfe (diff)
child 112 0a90a68583c7
Merge
--- 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 @@
 		<param name='OPT.l'/>
 		<param name='STATICLIBRARY'/>
 		<param name='TARGETTYPE' default="EXE"/>
+		<param name='LINKER_OPTIONS' default=''/>	
 	</interface>
 
 	<interface name="Tools.lib" extends="Tools.common" flm="tools2lib.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)
FCL/sftools/dev/build