Skip to content

Commit b8bded2

Browse files
committed
Implement suggestions from @njs
1 parent 0e9db31 commit b8bded2

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

docker/build_scripts/build.sh

+3-8
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,7 @@ yum -y install ${MANYLINUX1_DEPS}
6565
yum -y clean all > /dev/null 2>&1
6666
yum list installed
6767

68-
for PYVER in $PY_VERS; do
69-
soabi_flags_list="m"
70-
if [ $(lex_pyver $PYVER) -lt $(lex_pyver 3.3) ]; then
71-
soabi_flags_list="mu m"
72-
fi
73-
for soabi_flags in $soabi_flags_list; do
74-
/opt/${PYVER}${soabi_flags}/bin/python $MY_DIR/manylinux1-check.py
75-
done
68+
# Checks the same interpreters repeatedly, but is more thorough
69+
for PYTHON in /opt/*/bin/python; do
70+
$PYTHON $MY_DIR/manylinux1-check.py
7671
done

docker/build_scripts/build_utils.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function do_python_build {
3737
fi
3838
fi
3939
# -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
40-
CFLAGS="-Wformat" LDFLAGS="-Wl,-rpath /opt/${py_ver}${soabi_flags}/lib" ./configure --prefix=/opt/${py_ver}${soabi_flags} --disable-shared $unicode_flags > /dev/null
40+
CFLAGS="-Wformat" ./configure --prefix=/opt/${py_ver}${soabi_flags} --disable-shared $unicode_flags > /dev/null
4141
make -j2 > /dev/null
4242
make install > /dev/null
4343
}

0 commit comments

Comments
 (0)