Commit da98eccc authored by Andrew Murray's avatar Andrew Murray
Browse files

Moved default MB_ML_VER into common_utils

parent d2a10c47
...@@ -24,6 +24,9 @@ GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py ...@@ -24,6 +24,9 @@ GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
# with, so it is passed in when calling "docker run" for tests. # with, so it is passed in when calling "docker run" for tests.
UNICODE_WIDTH=${UNICODE_WIDTH:-32} UNICODE_WIDTH=${UNICODE_WIDTH:-32}
# Default Manylinux version
MB_ML_VER=${MB_ML_VER:-2014}
if [ $(uname) == "Darwin" ]; then if [ $(uname) == "Darwin" ]; then
IS_MACOS=1; IS_OSX=1; IS_MACOS=1; IS_OSX=1;
else else
......
...@@ -10,7 +10,6 @@ fi ...@@ -10,7 +10,6 @@ fi
CONFIGURE_BUILD_SOURCED=1 CONFIGURE_BUILD_SOURCED=1
BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}" BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
MB_ML_VER=${MB_ML_VER:-2014}
# IS_MACOS is defined in common_utils.sh # IS_MACOS is defined in common_utils.sh
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
......
...@@ -99,7 +99,7 @@ function openblas_get { ...@@ -99,7 +99,7 @@ function openblas_get {
# qual could be 64 to get a 64-bit version # qual could be 64 to get a 64-bit version
local qual=$2 local qual=$2
local prefix=openblas${qual}-v$OPENBLAS_VERSION local prefix=openblas${qual}-v$OPENBLAS_VERSION
local manylinux=manylinux${MB_ML_VER:-2014} local manylinux=manylinux${MB_ML_VER}
local fname="$prefix-${manylinux}_${plat}.tar.gz" local fname="$prefix-${manylinux}_${plat}.tar.gz"
local out_fname="${ARCHIVE_SDIR}/$fname" local out_fname="${ARCHIVE_SDIR}/$fname"
if [ ! -e "$out_fname" ]; then if [ ! -e "$out_fname" ]; then
......
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
# install_run # install_run
set -e set -e
# Default Manylinux version
# Warning: ignored if DOCKER_IMAGE variable is set.
# See build_multilinux function.
MB_ML_VER=${MB_ML_VER:-2014}
# Get our own location on this filesystem # Get our own location on this filesystem
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}") MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
......
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