Skip to content

Commit e73dc73

Browse files
committed
use bash arrays in build scripts
1 parent 4082939 commit e73dc73

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

conda-recipe-cf/build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,20 @@ read -r GLIBC_MAJOR GLIBC_MINOR <<< "$(conda list '^sysroot_linux-64$' \
1212
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
1313

1414
export CMAKE_GENERATOR="Ninja"
15-
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
15+
SKBUILD_ARGS=(
16+
"--"
17+
"-DCMAKE_C_COMPILER:PATH=icx"
18+
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
19+
)
1620

1721
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
1822
# Install packages and assemble wheel package from built bits
19-
WHEELS_BUILD_ARGS="-p manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64"
20-
${PYTHON} setup.py install bdist_wheel "${WHEELS_BUILD_ARGS}" "${SKBUILD_ARGS}"
23+
WHEELS_BUILD_ARGS=(
24+
"-p" "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64"
25+
)
26+
${PYTHON} setup.py install bdist_wheel "${WHEELS_BUILD_ARGS[@]}" "${SKBUILD_ARGS[@]}"
2127
cp dist/mkl_umath*.whl "${WHEELS_OUTPUT_FOLDER}"
2228
else
2329
# Perform regular install
24-
${PYTHON} setup.py install "${SKBUILD_ARGS}"
30+
${PYTHON} setup.py install "${SKBUILD_ARGS[@]}"
2531
fi

conda-recipe/build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,20 @@ read -r GLIBC_MAJOR GLIBC_MINOR <<< "$(conda list '^sysroot_linux-64$' \
1212
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
1313

1414
export CMAKE_GENERATOR="Ninja"
15-
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
15+
SKBUILD_ARGS=(
16+
"--"
17+
"-DCMAKE_C_COMPILER:PATH=icx"
18+
"-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
19+
)
1620

1721
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
1822
# Install packages and assemble wheel package from built bits
19-
WHEELS_BUILD_ARGS="-p manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64"
20-
${PYTHON} setup.py install bdist_wheel "${WHEELS_BUILD_ARGS}" "${SKBUILD_ARGS}"
23+
WHEELS_BUILD_ARGS=(
24+
"-p" "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64"
25+
)
26+
${PYTHON} setup.py install bdist_wheel "${WHEELS_BUILD_ARGS[@]}" "${SKBUILD_ARGS[@]}"
2127
cp dist/mkl_umath*.whl "${WHEELS_OUTPUT_FOLDER}"
2228
else
2329
# Perform regular install
24-
${PYTHON} setup.py install "${SKBUILD_ARGS}"
30+
${PYTHON} setup.py install "${SKBUILD_ARGS[@]}"
2531
fi

0 commit comments

Comments
 (0)