diff options
author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-08 19:50:24 +0000 |
---|---|---|
committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-08 19:50:24 +0000 |
commit | a015746737117339d4764e6531334dfcd20302c5 (patch) | |
tree | 0fed071315bba9db15b1612b9683e67c6b6fbfdd | |
parent | 61214cc436e04d65c5a9d03dd01cb3aca514984b (diff) | |
download | fpc-a015746737117339d4764e6531334dfcd20302c5.tar.gz |
* don't override specified assembler on the command line when leaving
assembler files in case that specified assembler is already an
external one
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@49137 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | compiler/options.pas | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/options.pas b/compiler/options.pas index 44adc00560..fcefbbde82 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -4450,10 +4450,10 @@ begin Message(option_w_unsupported_debug_format); { switch assembler if it's binary and we got -a on the cmdline } - if ((cs_asm_leave in init_settings.globalswitches) and - (af_outputbinary in target_asm.flags)) or - { if -s is passed, we shouldn't call the internal assembler } - (cs_asm_extern in init_settings.globalswitches) then + if (af_outputbinary in target_asm.flags) and + ((cs_asm_leave in init_settings.globalswitches) or + { if -s is passed, we shouldn't call the internal assembler } + (cs_asm_extern in init_settings.globalswitches)) then begin Message(option_switch_bin_to_src_assembler); {$ifdef llvm} |