From 145a7bf3049f930785b8f48c1268bc253732b767 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 14 Mar 2009 15:28:00 +0000 Subject: [PATCH] * only change the assembler to the default external assembler for Win32 when using DWARF if it hasn't been changed yet git-svn-id: trunk@12886 - --- compiler/options.pas | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/options.pas b/compiler/options.pas index 7d6577d9b8..1efb2c2ae6 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -2195,10 +2195,11 @@ begin which is required for dwarf on win32 (mantis 12872) } if (paratargetdbg in [dbg_dwarf2,dbg_dwarf3]) and - (target_info.system = system_i386_win32) then + (target_info.system = system_i386_win32) and + (target_asm.id = target_info.assem) then begin - Message(option_switch_bin_to_src_assembler); - set_target_asm(target_info.assemextern); + Message(option_switch_bin_to_src_assembler); + set_target_asm(target_info.assemextern); end; end;