Skip to content

GitLab

Unverified Commit 980d9b0e authored by John Jones's avatar John Jones
Browse files

more PR feedback

parent e22a4db8
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
manylinux_utils.sh
View file @ 980d9b0e
...@@ -44,9 +44,10 @@ function activate_ccache { ...@@ -44,9 +44,10 @@ function activate_ccache {
ln -s /parent-home/.ccache $HOME/.ccache ln -s /parent-home/.ccache $HOME/.ccache
# Now install ccache # Now install ccache
local ccache_dir
if [ -n "$IS_ALPINE" ]; then if [ -n "$IS_ALPINE" ]; then
supress apk add ccache supress apk add ccache
export PATH="/usr/lib/ccache/bin:$PATH" ccache_dir='/usr/lib/ccache/bin'
else else
if [[ $MB_ML_VER == "_2_24" ]]; then if [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro # debian:9 based distro
...@@ -59,14 +60,14 @@ function activate_ccache { ...@@ -59,14 +60,14 @@ function activate_ccache {
# Create fake compilers and prepend them to the PATH # Create fake compilers and prepend them to the PATH
# Note that yum is supposed to create these for us, # Note that yum is supposed to create these for us,
# but I had trouble finding them # but I had trouble finding them
local ccache_dir=/usr/lib/ccache/compilers ccache_dir='/usr/lib/ccache/compilers'
mkdir -p $ccache_dir mkdir -p $ccache_dir
ln -s /usr/bin/ccache $ccache_dir/gcc ln -s /usr/bin/ccache $ccache_dir/gcc
ln -s /usr/bin/ccache $ccache_dir/g++ ln -s /usr/bin/ccache $ccache_dir/g++
ln -s /usr/bin/ccache $ccache_dir/cc ln -s /usr/bin/ccache $ccache_dir/cc
ln -s /usr/bin/ccache $ccache_dir/c++ ln -s /usr/bin/ccache $ccache_dir/c++
export PATH=$ccache_dir:$PATH
fi fi
export PATH="$ccache_dir:$PATH"
# Prove to the developer that ccache is activated # Prove to the developer that ccache is activated
echo "Using C compiler: $(which gcc)" echo "Using C compiler: $(which gcc)"
......
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