[PR #6779] [MERGED] Use GOARCH for build dirs #12224

Closed
opened 2026-04-12 23:52:25 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/6779
Author: @dhiltgen
Created: 9/12/2024
Status: Merged
Merged: 9/12/2024
Merged by: @dhiltgen

Base: mainHead: goarch


📝 Commits (1)

  • ff1e356 Use GOARCH for build dirs

📊 Changes

2 files changed (+12 additions, -12 deletions)

View changed files

📝 llm/generate/gen_darwin.sh (+4 -4)
📝 llm/generate/gen_linux.sh (+8 -8)

📄 Description

Corrects x86_64 vs amd64 discrepancy

See https://github.com/ollama/ollama/blob/main/llm/generate/gen_common.sh#L6

This went unnoticed from #6547 due to the wildcards used in the payload, but once I tried to carry this over to the Go server branch we noticed when toggling between the C++ and Go servers they weren't correctly swapping back and forth on Linux.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/6779 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 9/12/2024 **Status:** ✅ Merged **Merged:** 9/12/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `goarch` --- ### 📝 Commits (1) - [`ff1e356`](https://github.com/ollama/ollama/commit/ff1e356e75da7d85b8f25cc77dba7f9be3d9bb74) Use GOARCH for build dirs ### 📊 Changes **2 files changed** (+12 additions, -12 deletions) <details> <summary>View changed files</summary> 📝 `llm/generate/gen_darwin.sh` (+4 -4) 📝 `llm/generate/gen_linux.sh` (+8 -8) </details> ### 📄 Description Corrects x86_64 vs amd64 discrepancy See https://github.com/ollama/ollama/blob/main/llm/generate/gen_common.sh#L6 This went unnoticed from #6547 due to the wildcards used in the payload, but once I tried to carry this over to the Go server branch we noticed when toggling between the C++ and Go servers they weren't correctly swapping back and forth on Linux. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-12 23:52:25 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#12224