[elpa] externals/beardbolt b71d1bd763 265/323: * beardbolt.el (bb-compile): Fix handling of bb-asm-format.

[ELPA Syncer]

branch: externals/beardbolt
commit b71d1bd76370b8c6837c9712edc6123aca85f297
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    * beardbolt.el (bb-compile): Fix handling of bb-asm-format.
---
 beardbolt.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/beardbolt.el b/beardbolt.el
index 8177010f63..57bdb7e1af 100644
--- a/beardbolt.el
+++ b/beardbolt.el
@@ -334,8 +334,7 @@ This function does NOT quote the return value for use in 
inferior shells."
                                "-"
                                "-o" (shell-quote-argument (bb-output-filename
                                                            (current-buffer)))
-                               (when (and bb-asm-format
-                                          (not bb-disassemble))
+                               (when (and bb-asm-format (not bb-disassemble))
                                  (format "-masm=%s" bb-asm-format)))
                          " "))
          (cmd (if (and bb-flag-quirks
@@ -360,6 +359,7 @@ This function does NOT quote the return value for use in 
inferior shells."
 (defvar bb-languages
   `((c-mode
      . ,(make-beardbolt-lang :compile-cmd-function #'bb--c-compile-cmd
+                             :base-cmd "gcc"
                              :objdumper 'objdump
                              :asm-function #'bb--process-src-asm-lines
                              :disass-function #'bb--process-disassembled-lines
@@ -367,6 +367,7 @@ This function does NOT quote the return value for use in 
inferior shells."
                              :disass-hidden-funcs bb--hidden-func-c))
     (c++-mode
      . ,(make-beardbolt-lang :compile-cmd-function #'bb--c-compile-cmd
+                             :base-cmd "g++"
                              :objdumper 'objdump
                              :asm-function #'bb--process-src-asm-lines
                              :disass-function #'bb--process-disassembled-lines
@@ -792,8 +793,8 @@ Interactively, determine LANG from `major-mode'."
                                 "&&"
                                 bb-objdump-binary "-d" (bb-output-filename 
src-buffer)
                                 "-C" "--insn-width=16" "-l"
-                                (when (not (booleanp bb-asm-format))
-                                  (concat "-M " bb-asm-format))
+                                (when bb-asm-format
+                                 (format "-M %s" bb-asm-format))
                                 ">" (bb-output-filename src-buffer t))
                           " ")))
         (_