Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
9d0f6698
Unverified
Commit
9d0f6698
authored
Jul 02, 2021
by
Isuru Fernando
Committed by
GitHub
Jul 02, 2021
Browse files
Merge pull request #414 from radarhere/cleanup
Only determine py_osx_ver when necessary
parents
a980404f
f85c8502
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
osx_utils.sh
osx_utils.sh
+1
-1
No files found.
osx_utils.sh
View file @
9d0f6698
...
@@ -154,7 +154,6 @@ function pyinst_fname_for_version {
...
@@ -154,7 +154,6 @@ function pyinst_fname_for_version {
# built for, eg: "10.6" or "10.9", if not defined, infers
# built for, eg: "10.6" or "10.9", if not defined, infers
# this from $py_version using macpython_sdk_for_version
# this from $py_version using macpython_sdk_for_version
local
py_version
=
$1
local
py_version
=
$1
local
py_osx_ver
=
${
2
:-
$(
macpython_sdk_for_version
$py_version
)
}
local
inst_ext
=
$(
pyinst_ext_for_version
$py_version
)
local
inst_ext
=
$(
pyinst_ext_for_version
$py_version
)
# Use the universal2 installer if we are on arm64
# Use the universal2 installer if we are on arm64
# universal2 installer for python 3.8 needs macos 11.0 to run on
# universal2 installer for python 3.8 needs macos 11.0 to run on
...
@@ -170,6 +169,7 @@ function pyinst_fname_for_version {
...
@@ -170,6 +169,7 @@ function pyinst_fname_for_version {
echo
"python-
${
py_version
}
-macos11.
${
inst_ext
}
"
echo
"python-
${
py_version
}
-macos11.
${
inst_ext
}
"
fi
fi
else
else
local
py_osx_ver
=
${
2
:-
$(
macpython_sdk_for_version
$py_version
)
}
echo
"python-
${
py_version
}
-macosx
${
py_osx_ver
}
.
${
inst_ext
}
"
echo
"python-
${
py_version
}
-macosx
${
py_osx_ver
}
.
${
inst_ext
}
"
fi
fi
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment