From 18085b9eb96691c6f11defe95d9e1e21fc5ef9ce Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 6 Feb 2019 13:07:03 -0800
Subject: [PATCH] cli: Compile C++ files first when loading parsers

---
 cli/src/loader.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cli/src/loader.rs b/cli/src/loader.rs
index 08d576ec..ca1202a6 100644
--- a/cli/src/loader.rs
+++ b/cli/src/loader.rs
@@ -184,16 +184,15 @@ impl Loader {
                     .arg("-I")
                     .arg(header_path)
                     .arg("-o")
-                    .arg(&library_path)
-                    .arg("-xc")
-                    .arg(parser_path);
+                    .arg(&library_path);
                 if let Some(scanner_path) = scanner_path.as_ref() {
                     if scanner_path.extension() == Some("c".as_ref()) {
                         command.arg("-xc").arg("-std=c99").arg(scanner_path);
                     } else {
-                        command.arg("-xc++").arg(scanner_path);
+                        command.arg(scanner_path);
                     }
                 }
+                command.arg("-xc").arg(parser_path);
             }
 
             let output = command.output()?;