From 3e60354bf2a2ad7e7fa81fe8107f3ce24e098287 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 2 May 2024 19:35:10 +0200
Subject: executor: make flatrpc build for C++

---
 executor/common_ext_test.go | 7 +------
 executor/executor.cc        | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'executor')

diff --git a/executor/common_ext_test.go b/executor/common_ext_test.go
index 00bca4494..d92eff00c 100644
--- a/executor/common_ext_test.go
+++ b/executor/common_ext_test.go
@@ -5,7 +5,6 @@ package executor
 
 import (
 	"bytes"
-	"os"
 	"testing"
 	"time"
 
@@ -26,11 +25,7 @@ func TestCommonExt(t *testing.T) {
 	if sysTarget.BrokenCompiler != "" {
 		t.Skipf("skipping, broken cross-compiler: %v", sysTarget.BrokenCompiler)
 	}
-	bin, err := csource.BuildFile(target, "executor.cc", "-DSYZ_TEST_COMMON_EXT_EXAMPLE=1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(bin)
+	bin := csource.BuildExecutor(t, target, "..", "-DSYZ_TEST_COMMON_EXT_EXAMPLE=1")
 	out, err := osutil.RunCmd(time.Minute, "", bin, "setup")
 	if err != nil {
 		t.Fatal(err)
diff --git a/executor/executor.cc b/executor/executor.cc
index f9ec7f1b5..6ac777ad6 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -3,6 +3,9 @@
 
 // +build
 
+// Currently this is unused (included only to test building).
+#include "pkg/flatrpc/flatrpc.h"
+
 #include <algorithm>
 #include <errno.h>
 #include <limits.h>
-- 
cgit mrf-deployment