Commit 8011f3e2 authored by mattip's avatar mattip
Browse files

remove 'm' from python path for 3.8 and up

parent 1826f1fd
...@@ -21,6 +21,7 @@ function cpython_path { ...@@ -21,6 +21,7 @@ function cpython_path {
local py_ver="${1:-2.7}" local py_ver="${1:-2.7}"
local u_width="${2:-${UNICODE_WIDTH}}" local u_width="${2:-${UNICODE_WIDTH}}"
local u_suff=u local u_suff=u
local m=m
# Back-compatibility # Back-compatibility
if [ "$u_width" == "u" ]; then u_width=32; fi if [ "$u_width" == "u" ]; then u_width=32; fi
# For Python >= 3.4, "u" suffix not meaningful # For Python >= 3.4, "u" suffix not meaningful
...@@ -31,8 +32,12 @@ function cpython_path { ...@@ -31,8 +32,12 @@ function cpython_path {
echo "Incorrect u_width value $u_width" echo "Incorrect u_width value $u_width"
exit 1 exit 1
fi fi
# Python 3.8 and up no longer uses the PYMALLOC 'm' suffix
if [ $(lex_ver $py_ver) -ge $(lex_ver 3.8) ]; then
m=""
fi
local no_dots=$(echo $py_ver | tr -d .) local no_dots=$(echo $py_ver | tr -d .)
echo "/opt/python/cp${no_dots}-cp${no_dots}m${u_suff}" echo "/opt/python/cp${no_dots}-cp${no_dots}$m${u_suff}"
} }
function repair_wheelhouse { function repair_wheelhouse {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment