Skip to content

Commit ecb667e

Browse files
authored
msys2: dont pass --build when targetting arm64 when running on Windows arm64 (conan-io#29509)
* msys2: dont pass `--build` when targetting arm64 * fix
1 parent 9c2b7ec commit ecb667e

File tree

2 files changed

+7
-31
lines changed

2 files changed

+7
-31
lines changed

recipes/msys2/all/conanfile.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from conan import ConanFile
22
from conan.errors import ConanInvalidConfiguration, ConanException
3-
from conan.tools.files import chdir, get, replace_in_file, copy
3+
from conan.tools.files import chdir, get, replace_in_file, copy, trim_conandata
44
from conan.tools.layout import basic_layout
55
import fnmatch
66
import os
@@ -9,7 +9,7 @@
99
import errno
1010
import ctypes
1111

12-
required_conan_version = ">=1.47.0"
12+
required_conan_version = ">=2.2"
1313

1414

1515
class lock:
@@ -61,6 +61,11 @@ class MSYS2Conan(ConanFile):
6161
def layout(self):
6262
basic_layout(self, src_folder="src")
6363

64+
def export(self):
65+
# this will ensure locally-exported recipes match the recipe revision from
66+
# the Conan Center remote
67+
trim_conandata(self)
68+
6469
def package_id(self):
6570
del self.info.options.no_kill
6671

@@ -209,5 +214,4 @@ def package_info(self):
209214
# Expose /opt/bin to PATH, so that aarch64-w64-mingw32- prefixed tools can be found
210215
# Define autotools host/build triplet so that the right tools are used
211216
self.cpp_info.bindirs.insert(0, os.path.join(msys_root, "opt", "bin"))
212-
self.conf_info.define("tools.gnu:build_triplet", "x86_64-w64-mingw32")
213217
self.conf_info.define("tools.gnu:host_triplet", "aarch64-w64-mingw32")

recipes/msys2/all/test_v1_package/conanfile.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)