From 34ff84df43f89a6f956a69264f77ff85e9db3750 Mon Sep 17 00:00:00 2001
From: Gabe Goodhart <ghart@us.ibm.com>
Date: Fri, 27 Jun 2025 17:17:45 -0600
Subject: [PATCH] fix: Use c++17 and include vendor for go wrapper modules

Branch: GraniteFour

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
---
 llama/llama.cpp/common/common.go   | 4 ++--
 llama/llama.cpp/tools/mtmd/mtmd.go | 4 ++--
 llama/llama.go                     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/llama/llama.cpp/common/common.go b/llama/llama.cpp/common/common.go
index ebbb738f2..e11bb1679 100644
--- a/llama/llama.cpp/common/common.go
+++ b/llama/llama.cpp/common/common.go
@@ -1,6 +1,6 @@
 package common
 
-// #cgo CXXFLAGS: -std=c++11
-// #cgo CPPFLAGS: -I${SRCDIR}/../include
+// #cgo CXXFLAGS: -std=c++17
+// #cgo CPPFLAGS: -I${SRCDIR}/../include -I${SRCDIR}/../vendor
 // #cgo CPPFLAGS: -I${SRCDIR}/../../../ml/backend/ggml/ggml/include
 import "C"
diff --git a/llama/llama.cpp/tools/mtmd/mtmd.go b/llama/llama.cpp/tools/mtmd/mtmd.go
index 064790368..63212135b 100644
--- a/llama/llama.cpp/tools/mtmd/mtmd.go
+++ b/llama/llama.cpp/tools/mtmd/mtmd.go
@@ -1,6 +1,6 @@
 package mtmd
 
-// #cgo CXXFLAGS: -std=c++11
-// #cgo CPPFLAGS: -I${SRCDIR}/../../include -I${SRCDIR}/../../common
+// #cgo CXXFLAGS: -std=c++17
+// #cgo CPPFLAGS: -I${SRCDIR}/../../include -I${SRCDIR}/../../common -I${SRCDIR}/../../vendor
 // #cgo CPPFLAGS: -I${SRCDIR}/../../../../ml/backend/ggml/ggml/include
 import "C"
diff --git a/llama/llama.go b/llama/llama.go
index ba1d1f2a4..31fdba69b 100644
--- a/llama/llama.go
+++ b/llama/llama.go
@@ -6,6 +6,7 @@ package llama
 #cgo CXXFLAGS: -std=c++17
 #cgo CPPFLAGS: -I${SRCDIR}/llama.cpp/include
 #cgo CPPFLAGS: -I${SRCDIR}/llama.cpp/common
+#cgo CPPFLAGS: -I${SRCDIR}/llama.cpp/vendor
 #cgo CPPFLAGS: -I${SRCDIR}/llama.cpp/tools/mtmd
 #cgo CPPFLAGS: -I${SRCDIR}/llama.cpp/src
 #cgo CPPFLAGS: -I${SRCDIR}/../ml/backend/ggml/ggml/include