From: Xuan-Son Nguyen <redacted>
Date: Fri, 19 Sep 2025 06:02:51 +0000 (+0700)
Subject: chat : fix build on arm64 (#16101)
X-Git-Tag: upstream/0.0.6527~8
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=4b8560ab56fdd9819358b47c338bbc8ec357c57e;p=pkg%2Fggml%2Fsources%2Fllama.cpp

chat : fix build on arm64 (#16101)
---

diff --git a/common/chat.cpp b/common/chat.cpp
index 4707c4fe..5ac57f1e 100644
--- a/common/chat.cpp
+++ b/common/chat.cpp
@@ -1741,10 +1741,12 @@ static void common_chat_parse_gpt_oss(common_chat_msg_parser & builder) {
 static common_chat_params common_chat_params_init_firefunction_v2(const common_chat_template & tmpl, const struct templates_params & inputs) {
     LOG_DBG("%s\n", __func__);
     common_chat_params data;
-    data.prompt = apply(tmpl, inputs, /* messages_override =*/ std::nullopt, /* tools_override= */ json(), json {
+    const std::optional<json> tools_override = json();
+    const std::optional<json> additional_context = json {
         {"datetime", format_time(inputs.now, "%b %d %Y %H:%M:%S GMT")},
         {"functions", json(inputs.tools.empty() ? "" : inputs.tools.dump(2))},
-    });
+    };
+    data.prompt = apply(tmpl, inputs, /* messages_override =*/ std::nullopt, tools_override, additional_context);
     if (inputs.tools.is_array() && !inputs.tools.empty()) {
         data.grammar_lazy = inputs.tool_choice != COMMON_CHAT_TOOL_CHOICE_REQUIRED;
         data.grammar = build_grammar([&](const common_grammar_builder & builder) {