From 759e8399e15ca570d3d67165664e43a17092c5b3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 21 Mar 2023 07:54:29 +0200
Subject: Add --archive-no-{cpu,os} pkg-bindist options

---
 bpkg/system-package-manager-archive.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'bpkg/system-package-manager-archive.cxx')

diff --git a/bpkg/system-package-manager-archive.cxx b/bpkg/system-package-manager-archive.cxx
index 3f5143f..53ef481 100644
--- a/bpkg/system-package-manager-archive.cxx
+++ b/bpkg/system-package-manager-archive.cxx
@@ -505,8 +505,11 @@ namespace bpkg
     }
     else
     {
-      base += '-' + target.cpu;
-      base += '-' + os_release.name_id + os_release.version_id;
+      if (!ops->archive_no_cpu ())
+        base += '-' + target.cpu;
+
+      if (!ops->archive_no_os ())
+        base += '-' + os_release.name_id + os_release.version_id;
 
       // First collect the interface languages and then add implementation.
       // This way if different languages map to the same runtimes (e.g., C and
-- 
cgit v1.1