Skip to content

Commit 7d5fcd0

Browse files
committed
Remove all references to cmake for the builds in this repo (PowerShell#16578)
# Conflicts: # build.psm1 # test/perf/benchmarks/assets/compiler.test.ps1 # Conflicts: # docs/building/linux.md
1 parent 96bde40 commit 7d5fcd0

File tree

4 files changed

+9
-29
lines changed

4 files changed

+9
-29
lines changed

build.psm1

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,11 +1822,7 @@ function Start-PSBootstrap {
18221822
$Deps = @()
18231823
if ($environment.IsLinux -and $environment.IsUbuntu) {
18241824
# Build tools
1825-
$Deps += "curl", "g++", "cmake", "make"
1826-
1827-
if ($BuildLinuxArm) {
1828-
$Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
1829-
}
1825+
$Deps += "curl", "wget"
18301826

18311827
# .NET Core required runtime libraries
18321828
$Deps += "libunwind8"
@@ -1852,7 +1848,7 @@ function Start-PSBootstrap {
18521848
}
18531849
} elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
18541850
# Build tools
1855-
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
1851+
$Deps += "which", "curl", "wget"
18561852

18571853
# .NET Core required runtime libraries
18581854
$Deps += "libicu", "libunwind"
@@ -1876,7 +1872,7 @@ function Start-PSBootstrap {
18761872
}
18771873
} elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
18781874
# Build tools
1879-
$Deps += "gcc", "cmake", "make"
1875+
$Deps += "wget"
18801876

18811877
# Packaging tools
18821878
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -1901,8 +1897,8 @@ function Start-PSBootstrap {
19011897
$PackageManager = "$sudo port"
19021898
}
19031899

1904-
# Build tools
1905-
$Deps += "cmake"
1900+
# wget for downloading dotnet
1901+
$Deps += "wget"
19061902

19071903
# .NET Core required runtime libraries
19081904
$Deps += "openssl"
@@ -1911,7 +1907,7 @@ function Start-PSBootstrap {
19111907
# ignore exitcode, because they may be already installed
19121908
Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
19131909
} elseif ($environment.IsLinux -and $environment.IsAlpine) {
1914-
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl'
1910+
$Deps += 'libunwind', 'libcurl', 'bash', 'build-base', 'git', 'curl', 'wget'
19151911

19161912
Start-NativeExecution {
19171913
Invoke-Expression "apk add $Deps"

docs/building/linux.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ refer to the [Working with the PowerShell Repository](../git/README.md),
1818

1919
### Toolchain Setup
2020

21-
We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components,
22-
and [CMake][] to build the native components.
21+
We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components.
2322

2423
Installing the toolchain is as easy as running `Start-PSBootstrap` in PowerShell.
2524
Of course, this requires a self-hosted copy of PowerShell on Linux.
@@ -54,8 +53,7 @@ The `Start-PSBootstrap` function does the following:
5453

5554
If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your `PATH` environment variable.
5655

57-
[dotnet-cli]: https://github.com/dotnet/cli
58-
[CMake]: https://cmake.org/cmake/help/v2.8.12/cmake.html
56+
[dotnet-cli]: https://docs.microsoft.com/dotnet/core/tools/
5957

6058
## Build using our module
6159

docs/building/macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ From `pwsh.exe`, run `Import-Module ./build.psm1` and use `Start-PSBootstrap` to
1414

1515
The `Start-PSBootstrap` function does the following:
1616

17-
- Uses `brew` or `port` to install CMake, OpenSSL, and GNU WGet
17+
- Uses `brew` or `port` to install OpenSSL, and GNU WGet
1818
- Uninstalls any prior versions of .NET CLI
1919
- Downloads and installs .NET Core SDK to `~/.dotnet`
2020

tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile

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

0 commit comments

Comments
 (0)