From 2189bb812b48ca83132520c1e4f5754ef87ca563 Mon Sep 17 00:00:00 2001 From: armin Date: Thu, 25 Nov 2004 18:46:11 +0000 Subject: [PATCH] * added utilsprefix for as,ld and nlmconv --- compiler/systems/t_nwl.pas | 13 ++++++++----- compiler/systems/t_nwm.pas | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/compiler/systems/t_nwl.pas b/compiler/systems/t_nwl.pas index dac948a3cf..a20b46fdc7 100644 --- a/compiler/systems/t_nwl.pas +++ b/compiler/systems/t_nwl.pas @@ -273,12 +273,12 @@ begin with Info do begin {$ifndef netware} - ExeCmd[1]:= 'ld -Ur -T $RES $STRIP -o $TMPOBJ'; - ExeCmd[2]:='nlmconv -T$RES'; + ExeCmd[1]:= FindUtil(utilsprefix+'ld') + ' -Ur -T $RES $STRIP -o $TMPOBJ'; + ExeCmd[2]:= FindUtil(utilsprefix+'nlmconv') + ' -T$RES'; {$else} {for running on netware we need absolute pathes since ld has another working directory} - ExeCmd[1]:= 'ld -Ur -T '+FExpand(outputexedir+Info.ResName)+' $STRIP -o '+Fexpand(outputexedir+tmpLinkFileName); - ExeCmd[2]:='nlmconv -T'+FExpand(outputexedir+'n'+Info.ResName); + ExeCmd[1]:= FindUtil(utilsprefix+'ld') + ' -Ur -T '+FExpand(outputexedir+Info.ResName)+' $STRIP -o '+Fexpand(outputexedir+tmpLinkFileName); + ExeCmd[2]:= FindUtil(utilsprefix+'nlmconv') + ' -T'+FExpand(outputexedir+'n'+Info.ResName); {$endif} end; end; @@ -646,7 +646,10 @@ initialization end. { $Log$ - Revision 1.10 2004-11-19 16:30:24 peter + Revision 1.11 2004-11-25 18:46:11 armin + * added utilsprefix for as,ld and nlmconv + + Revision 1.10 2004/11/19 16:30:24 peter * fixed setting of mangledname when importing Revision 1.9 2004/11/08 22:09:59 peter diff --git a/compiler/systems/t_nwm.pas b/compiler/systems/t_nwm.pas index 60960caa0d..25b4c3308f 100644 --- a/compiler/systems/t_nwm.pas +++ b/compiler/systems/t_nwm.pas @@ -265,12 +265,12 @@ begin with Info do begin {$ifndef netware} - ExeCmd[1]:= 'ld -Ur -T $RES $STRIP -o $TMPOBJ'; - ExeCmd[2]:='nlmconv -T$RES'; + ExeCmd[1]:= FindUtil(utilsprefix+'ld') + ' -Ur -T $RES $STRIP -o $TMPOBJ'; + ExeCmd[2]:= FindUtil(utilsprefix+'nlmconv') + ' -T$RES'; {$else} {for running on netware we need absolute pathes since ld has another working directory} - ExeCmd[1]:= 'ld -Ur -T '+FExpand(outputexedir+Info.ResName)+' $STRIP -o '+Fexpand(outputexedir+tmpLinkFileName); - ExeCmd[2]:='nlmconv -T'+FExpand(outputexedir+'n'+Info.ResName); + ExeCmd[1]:= FindUtil(utilsprefix+'ld') + ' -Ur -T '+FExpand(outputexedir+Info.ResName)+' $STRIP -o '+Fexpand(outputexedir+tmpLinkFileName); + ExeCmd[2]:= FindUtil(utilsprefix+'nlmconv') + ' -T'+FExpand(outputexedir+'n'+Info.ResName); {$endif} end; end; @@ -564,7 +564,10 @@ initialization end. { $Log$ - Revision 1.21 2004-11-19 16:30:24 peter + Revision 1.22 2004-11-25 18:46:11 armin + * added utilsprefix for as,ld and nlmconv + + Revision 1.21 2004/11/19 16:30:24 peter * fixed setting of mangledname when importing Revision 1.20 2004/11/08 22:09:59 peter