From 3bb90a1d1c8008faeef3d863ed09b20f5dadff2d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Dec 2025 20:12:37 +0000
Subject: [PATCH 1/2] Initial plan


From cc02d6a222f738c441aefe1c2733d20d9cbf53da Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Dec 2025 20:19:58 +0000
Subject: [PATCH 2/2] Fix repeated --import_dirs in cpp_golden_test

Changed build_defs.bzl to pass directory paths directly instead of
prefixed with --import-dir=, since one_golden_test.py already adds
the --import-dir flag when constructing frontend arguments.

Fixes google/emboss#236

Co-authored-by: AaronWebster <3766083+AaronWebster@users.noreply.github.com>
---
 compiler/back_end/cpp/build_defs.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/back_end/cpp/build_defs.bzl b/compiler/back_end/cpp/build_defs.bzl
index 78d22f3..11ce472 100644
--- a/compiler/back_end/cpp/build_defs.bzl
+++ b/compiler/back_end/cpp/build_defs.bzl
@@ -65,7 +65,7 @@ def cpp_golden_test(name, emb_file, golden_file, import_dirs = []):
             "$(location :emboss_codegen_cpp)",
             "$(location %s)" % emb_file,
             "$(location %s)" % golden_file,
-        ] + ["--import-dir=" + d for d in import_dirs],
+        ] + import_dirs,
         data = [
             "//compiler/front_end:emboss_front_end",
             ":emboss_codegen_cpp",