Skip to content

Commit 1743b59

Browse files
authored
rm arch checks in build script (#906)
1 parent 45faa62 commit 1743b59

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

deps/build.jl

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ mkpath(dirname(prefsfile))
4343
try # make sure deps.jl file is removed on error
4444
python = try
4545
let py = get(ENV, "PYTHON", isfile(prefsfile) ? readchomp(prefsfile) :
46-
(Sys.isunix() && !Sys.isapple()) || Sys.ARCH (:i686, :x86_64) ?
46+
(Sys.isunix() && !Sys.isapple()) ?
4747
whichfirst("python3", "python") : "Conda"),
4848
vers = isempty(py) || py == "Conda" ? v"0.0" : vparse(pyconfigvar(py,"VERSION","0.0"))
4949
if vers < v"2.7"
@@ -64,19 +64,14 @@ try # make sure deps.jl file is removed on error
6464
py
6565
end
6666
catch e1
67-
if Sys.ARCH in (:i686, :x86_64)
68-
if isa(e1, UseCondaPython)
69-
@info string("Using the Python distribution in the Conda package by default.\n",
70-
"To use a different Python version, set ENV[\"PYTHON\"]=\"pythoncommand\" and re-run Pkg.build(\"PyCall\").")
71-
else
72-
@info string( "No system-wide Python was found; got the following error:\n",
73-
"$e1\nusing the Python distribution in the Conda package")
74-
end
75-
abspath(Conda.PYTHONDIR, "python" * (Sys.iswindows() ? ".exe" : ""))
67+
if isa(e1, UseCondaPython)
68+
@info string("Using the Python distribution in the Conda package by default.\n",
69+
"To use a different Python version, set ENV[\"PYTHON\"]=\"pythoncommand\" and re-run Pkg.build(\"PyCall\").")
7670
else
77-
error("No system-wide Python was found; got the following error:\n",
78-
"$e1")
71+
@info string("No system-wide Python was found; got the following error:\n",
72+
"$e1\nusing the Python distribution in the Conda package")
7973
end
74+
abspath(Conda.PYTHONDIR, "python" * (Sys.iswindows() ? ".exe" : ""))
8075
end
8176

8277
use_conda = dirname(python) == abspath(Conda.PYTHONDIR)

0 commit comments

Comments
 (0)