Merge branch 'pranith-master'
This commit is contained in:
commit
9c7d3602e1
12
make.sh
12
make.sh
|
@ -68,8 +68,8 @@ function build {
|
||||||
|
|
||||||
${MAKE} clean
|
${MAKE} clean
|
||||||
|
|
||||||
if [ ${CC}x != x ]; then
|
if [ -n "$CC" ]; then
|
||||||
${MAKE} CC=$CC $*
|
${MAKE} CC="$CC" $*
|
||||||
else
|
else
|
||||||
${MAKE} $*
|
${MAKE} $*
|
||||||
fi
|
fi
|
||||||
|
@ -101,14 +101,14 @@ function install {
|
||||||
fi
|
fi
|
||||||
else # not OSX
|
else # not OSX
|
||||||
if test -d /usr/lib64; then
|
if test -d /usr/lib64; then
|
||||||
if [ ${CC}x != x ]; then
|
if [ -n "$CC" ]; then
|
||||||
${MAKE} LIBDIRARCH=lib64 CC=$CC install
|
${MAKE} LIBDIRARCH=lib64 CC="$CC" install
|
||||||
else
|
else
|
||||||
${MAKE} LIBDIRARCH=lib64 install
|
${MAKE} LIBDIRARCH=lib64 install
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ ${CC}x != x ]; then
|
if [ -n "$CC" ]; then
|
||||||
${MAKE} CC=$CC install
|
${MAKE} CC="$CC" install
|
||||||
else
|
else
|
||||||
${MAKE} install
|
${MAKE} install
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue