Skip to content

Commit

Permalink
Merge branch 'pranith-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
aquynh committed Jul 13, 2015
2 parents af806e0 + 6757887 commit 11bcd64
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function build {

${MAKE} clean

if [ ${CC}x != x ]; then
${MAKE} CC=$CC $*
if [ -n "$CC" ]; then
${MAKE} CC="$CC" $*
else
${MAKE} $*
fi
Expand Down Expand Up @@ -101,14 +101,14 @@ function install {
fi
else # not OSX
if test -d /usr/lib64; then
if [ ${CC}x != x ]; then
${MAKE} LIBDIRARCH=lib64 CC=$CC install
if [ -n "$CC" ]; then
${MAKE} LIBDIRARCH=lib64 CC="$CC" install
else
${MAKE} LIBDIRARCH=lib64 install
fi
else
if [ ${CC}x != x ]; then
${MAKE} CC=$CC install
if [ -n "$CC" ]; then
${MAKE} CC="$CC" install
else
${MAKE} install
fi
Expand Down

0 comments on commit 11bcd64

Please sign in to comment.