From f5f41baa2554b24813cc2f212ecf2e45476063e1 Mon Sep 17 00:00:00 2001
From: Martin Dahl <martin.dahl@gmail.com>
Date: Mon, 26 Jun 2023 22:23:51 +0200
Subject: [PATCH] Don't generate msg_includes.h in parallel with bindgen
 generation.

---
 r2r_msg_gen/build.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/r2r_msg_gen/build.rs b/r2r_msg_gen/build.rs
index 31ac0f45b..7ccefa8a9 100644
--- a/r2r_msg_gen/build.rs
+++ b/r2r_msg_gen/build.rs
@@ -90,12 +90,10 @@ fn generate_bindings(bindgen_dir: &Path, msg_list: &[RosMsg]) {
     // Run codegen in parallel.
     rayon::scope(|scope| {
         scope.spawn(|_| {
+            generate_includes(bindgen_dir, msg_list);
             let bindings = generate_bindings_file(bindgen_dir);
             generate_constants(bindgen_dir, msg_list, &bindings);
         });
-        scope.spawn(|_| {
-            generate_includes(bindgen_dir, msg_list);
-        });
         scope.spawn(|_| {
             generate_introspecion_map(bindgen_dir, msg_list);
         });