Skip to content

Re-evaluate host machine arch on Xcode backend generate #15765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kode54 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

Re-evaluate host machine arch on Xcode backend generate #15765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions mesonbuild/backend/xcodebackend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,7 @@ def __init__(self, build: T.Optional[build.Build]):
self.regen_dependency_id = self.gen_id()
self.top_level_dict = PbxDict()
self.generator_outputs = {}
self.arch = self.build.environment.machines.host.cpu
if self.arch == 'aarch64':
self.arch = 'arm64'
self.set_arch()
self.xcodeversion, self.objversion = autodetect_xcode_version()
# In Xcode files are not accessed via their file names, but rather every one of them
# gets an unique id. More precisely they get one unique id per target they are used
Expand Down Expand Up @@ -310,7 +308,14 @@ def determine_swift_dep_dirs(self, target: build.BuildTarget) -> T.List[str]:
result.append(os.path.join(self.environment.get_build_dir(), self.get_target_dir(l)))
return result

def set_arch(self):
self.arch = self.build.environment.machines.host.cpu
if self.arch == 'aarch64':
self.arch = 'arm64'

def generate(self, capture: bool = False, vslite_ctx: T.Optional[T.Dict] = None) -> None:
if self.arch is None: # The host machine arch may not be set when backend is created
self.set_arch()
# Check for (currently) unexpected capture arg use cases -
if capture:
raise MesonBugException('We do not expect the xcode backend to generate with \'capture = True\'')
Expand Down
Loading