From 9399dec20e41256b3c6795294c8bb560fb769b39 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 24 Sep 2001 22:23:56 +0000 Subject: [PATCH] Fixed the link setup so it actually works. [SVN r11239] --- metrowerks-tools.jam | 3 ++- v1/metrowerks-tools.jam | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/metrowerks-tools.jam b/metrowerks-tools.jam index 61038e571..a142e8ca9 100644 --- a/metrowerks-tools.jam +++ b/metrowerks-tools.jam @@ -17,6 +17,7 @@ # if METROWERKS_ROOT is unset, this will "multiply away" to nothing. METROWERKS_SETUP = "call "\"$(METROWERKS_ROOT)$(SLASH)"Other Metrowerks Tools"$(SLASH)"Command Line Tools"$(SLASH)cwenv.bat\"" -quiet" ; +METROWERKS_LINK_SETUP = "set MWWinx86LibraryFiles=" ; flags metrowerks DEFINES ; flags metrowerks UNDEFS ; @@ -78,7 +79,7 @@ rule Link-action actions metrowerks-Link-action bind NEEDLIBS { $(METROWERKS_SETUP) - set MWWinx86LibraryFiles=$(STDLIBS) + $(METROWERKS_LINK_SETUP)$(STDLIBS) mwld -export dllexport -nowraplines $(LINKFLAGS) -L$(LIBPATH) -L$(STDLIBPATH) $(IMPLIB_COMMAND)"$(<[2])" -o "$(<[1])" $(UNDEFS) $(NEEDLIBS) "$(>)" -l$(FINDLIBS) } diff --git a/v1/metrowerks-tools.jam b/v1/metrowerks-tools.jam index 61038e571..a142e8ca9 100644 --- a/v1/metrowerks-tools.jam +++ b/v1/metrowerks-tools.jam @@ -17,6 +17,7 @@ # if METROWERKS_ROOT is unset, this will "multiply away" to nothing. METROWERKS_SETUP = "call "\"$(METROWERKS_ROOT)$(SLASH)"Other Metrowerks Tools"$(SLASH)"Command Line Tools"$(SLASH)cwenv.bat\"" -quiet" ; +METROWERKS_LINK_SETUP = "set MWWinx86LibraryFiles=" ; flags metrowerks DEFINES ; flags metrowerks UNDEFS ; @@ -78,7 +79,7 @@ rule Link-action actions metrowerks-Link-action bind NEEDLIBS { $(METROWERKS_SETUP) - set MWWinx86LibraryFiles=$(STDLIBS) + $(METROWERKS_LINK_SETUP)$(STDLIBS) mwld -export dllexport -nowraplines $(LINKFLAGS) -L$(LIBPATH) -L$(STDLIBPATH) $(IMPLIB_COMMAND)"$(<[2])" -o "$(<[1])" $(UNDEFS) $(NEEDLIBS) "$(>)" -l$(FINDLIBS) }