actions
/
python-versions
mirror of https://github.com/actions/python-versions.git
3
0
Fork 0
Code Actions 2 Packages Releases Activity

remove compile fixes

This commit is contained in:
Maxim Lobanov 2020-04-28 08:32:53 +03:00
parent 4b4b389d79
commit fef4cac8d4
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builders/nix-python-builder.psm1
View File

@ -108,13 +108,8 @@ class NixPythonBuilder : PythonBuilder {
Write-Debug "make Python $($this.Version)-$($this.Architecture) $($this.Platform)"
$buildOutputLocation = New-Item -Path $this.WorkFolderLocation -Name "build_output.txt" -ItemType File
# Fix error "find: build": build dir not exist before first compilation
New-Item -ItemType Directory -Path ./build
# execute "make" with error action = continue for python 2.* for ubuntu, because it throws errors with some modules
$makeErrorAction = if ($this.Version.Major -eq 2 -and $this.Platform -match "ubuntu") { "Continue" } else { "Stop" }
Execute-Command -Command "make 2>&1 | tee $buildOutputLocation" -ErrorAction $makeErrorAction
Execute-Command -Command "make install" -ErrorAction $makeErrorAction
Execute-Command -Command "make 2>&1 | tee $buildOutputLocation" -ErrorAction Continue
Execute-Command -Command "make install" -ErrorAction Continue
Write-Debug "Done; Make log location: $buildOutputLocation"
}

1
builders/ubuntu-python-builder.psm1
View File

@ -32,7 +32,6 @@ class UbuntuPythonBuilder : NixPythonBuilder {
### To build Python with SO we must pass full path to lib folder to the linker
$env:LDFLAGS="-Wl,--rpath=${pythonBinariesLocation}/lib"
$env:CFLAGS="-w"
$configureString = "./configure --prefix=$pythonBinariesLocation --enable-shared --enable-optimizations"
if ($this.Version -lt "3.0.0") {