Skip to content

Commit 2ce7113

Browse files
committed
Remove arch brew args
1 parent 3bd7e89 commit 2ce7113

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

Documentation/building/unix/dependencies.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ to provide install instructions to obtain the missing dependency, e.g.:
3636
[Homebrew](https://brew.sh) must be installed and available via `$PATH` in
3737
order to provision xamarin-android.
3838

39-
When building on Apple Silicon (arm64) machines, use the **arch**(1) command to
40-
allow Homebrew to be installed:
41-
42-
% arch -arch x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
43-
44-
4539
<a name="mono-sdk" />
4640

4741
## Mono MDK

build-tools/xaprepare/xaprepare/ToolRunners/BrewRunner.MacOS.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ partial class BrewRunner : ToolRunner
1111
static readonly char[] lineSplit = new [] { '\n' };
1212

1313
bool? needSudo;
14-
bool? needArch;
15-
1614
protected override string DefaultToolExecutableName => GetDefaultExecutableName ();
1715
protected override string ToolName => "Homebrew";
1816

@@ -35,13 +33,10 @@ string GetDefaultExecutableName ()
3533
throw new InvalidOperationException ($"BrewRunner does not suppport {Context.Instance.OS.Name}");
3634

3735
needSudo = os.HomebrewVersion != null && os.HomebrewVersion < sudoVersion;
38-
needArch = os.ProcessIsTranslated;
3936
}
4037

4138
if (needSudo ?? false)
4239
return "sudo";
43-
if (needArch ?? false)
44-
return "arch";
4540

4641
return BrewPath;
4742
}
@@ -169,17 +164,7 @@ ProcessRunner GetBrewRunner (bool echoOutput, bool echoError, List<string> argum
169164
{
170165
ProcessRunner runner = CreateProcessRunner ();
171166

172-
if ((needSudo ?? false) && (needArch ?? false)) {
173-
// So we run `sudo arch -arch x86_64 brew …`
174-
runner.AddArgument ("arch");
175-
}
176-
177-
if (needArch ?? false) {
178-
runner.AddArgument ("-arch");
179-
runner.AddArgument ("x86_64");
180-
}
181-
182-
if ((needSudo ?? false) || (needArch ?? false)) {
167+
if ((needSudo ?? false) ) {
183168
runner.AddArgument (BrewPath);
184169
}
185170

0 commit comments

Comments
 (0)