diff -r 5e7562f67577 -r c327db0664bb sbsv2/raptor/lib/flm/tools2exe.flm
--- a/sbsv2/raptor/lib/flm/tools2exe.flm	Sun May 16 13:06:27 2010 +0100
+++ b/sbsv2/raptor/lib/flm/tools2exe.flm	Mon May 17 20:20:32 2010 +0100
@@ -1,77 +1,85 @@
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# Function-Like Makefile to build a TOOLS2 EXE with gcc
-# 
-#
-
-## Outputs - externally relevant targets that this FLM generates
-ifeq ($(OSTYPE),cygwin)
-SYSTEMLIBS:=$(LIBS.WIN32)
-else
-SYSTEMLIBS:=$(LIBS.LINUX)
-endif
-
-EXETARGET:=$(RELEASEPATH)/$(TARGET)$(DOTEXE)
-
-ifneq ($(TOOLSPATH),)
-INSTALLED:=$(TOOLSPATH)/$(TARGET)$(DOTEXE)
-endif
-
-## Target groups
-RELEASEABLES:=$(INSTALLED)
-TARGETS:=$(EXETARGET) $(INSTALLED)
-
-## Common build steps (compiling and cleaning)
-include $(FLMHOME)/tools2common.flm
-
-## Static libraries
-ifneq ($(STATICLIBRARY),)
-STATICLIBS:=$(patsubst %,$(RELEASEPATH)/lib%.a,$(STATICLIBRARY))
-LLIBS:=$(OPT.L)"$(RELEASEPATH)" $(patsubst %,$(OPT.l)%,$(STATICLIBRARY))
-#
-ifneq ($(SYSTEMLIBS),)
-LLIBS:=$(LLIBS) $(patsubst %,$(OPT.l)%,$(SYSTEMLIBS))
-endif
-#
-endif
-
-## Link executable
-# get OBJECTFILES from call to tools2common
-define tools2linkexe
-$(EXETARGET): $(OBJECTFILES) $(STATICLIBS)
-	$(call startrule,tools2linkexe) \
-	$(LINKER) $(CFLAGS) $(LFLAGS) $(OPT.O)"$(EXETARGET)" $(call dblquote,$(OBJECTFILES)) $(LLIBS) \
-	$(if $(SAVESPACE),; $(GNURM) -rf $(OUTPUTPATH); true,) \
-	$(call endrule,tools2linkexe)
-
-endef
-
-$(eval $(call tools2linkexe))
-
-	
-## Copy executable to the tools directory
-ifneq ($(TOOLSPATH),)
-define tools2install
-$(INSTALLED): $(EXETARGET)
-	$(call startrule,tools2install) \
-	$(GNUCP) "$(EXETARGET)" "$(INSTALLED)" && \
-	$(GNUCHMOD) a+rwx "$(INSTALLED)" \
-	$(call endrule,tools2install)
-endef
-
-$(eval $(call tools2install))
-
-endif
-
-## The End
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Function-Like Makefile to build a TOOLS2 EXE with gcc
+# 
+#
+
+## Outputs - externally relevant targets that this FLM generates
+ifeq ($(filter win,$(HOSTPLATFORM)),win)
+SYSTEMLIBS:=$(LIBS.WIN32)
+else
+ifneq ($(TOOLS2WIN32),)
+# Build win32 tools in Linux 
+SYSTEMLIBS:=$(LIBS.WIN32)
+else
+# Build linux tools in Linux
+SYSTEMLIBS:=$(LIBS.LINUX)
+endif
+endif
+
+
+EXETARGET:=$(RELEASEPATH)/$(TARGET)$(DOTEXE)
+
+INSTALLED:=
+ifneq ($(TOOLSPATH),)
+INSTALLED:=$(TOOLSPATH)/$(TARGET)$(DOTEXE)
+endif
+
+## Target groups
+RELEASABLES:=$(INSTALLED)
+TARGETS:=$(EXETARGET) $(INSTALLED)
+
+## Common build steps (compiling and cleaning)
+include $(FLMHOME)/tools2common.flm
+
+## Static libraries
+ifneq ($(STATICLIBRARY),)
+STATICLIBS:=$(patsubst %,$(RELEASEPATH)/lib%.a,$(STATICLIBRARY))
+LLIBS:=$(OPT.L)"$(RELEASEPATH)" $(patsubst %,$(OPT.l)%,$(STATICLIBRARY))
+#
+ifneq ($(SYSTEMLIBS),)
+LLIBS:=$(LLIBS) $(patsubst %,$(OPT.l)%,$(SYSTEMLIBS))
+endif
+#
+endif
+
+## Link executable
+# get OBJECTFILES from call to tools2common
+define tools2linkexe
+$(EXETARGET): $(OBJECTFILES) $(STATICLIBS)
+	$(call startrule,tools2linkexe) \
+	$(LINKER) $(CFLAGS) $(LFLAGS) $(OPT.O)"$(EXETARGET)" $(call dblquote,$(OBJECTFILES)) $(LLIBS) $(LINKER_OPTIONS) \
+	$(if $(SAVESPACE),; $(GNURM) -rf $(OUTPUTPATH); true,) \
+	$(call endrule,tools2linkexe)
+
+endef
+
+$(eval $(call tools2linkexe))
+
+	
+## Copy executable to the tools directory
+ifneq ($(TOOLSPATH),)
+define tools2install
+$(INSTALLED): $(EXETARGET)
+	$(call startrule,tools2install) \
+	$(GNUCP) "$(EXETARGET)" "$(INSTALLED)" && \
+	$(GNUCHMOD) a+rwx "$(INSTALLED)" \
+	$(call endrule,tools2install)
+endef
+
+$(eval $(call tools2install))
+
+endif
+
+## The End