Skip to content

Commit

Permalink
Merge pull request #120 from yarlB/CC-substitution-homogenization
Browse files Browse the repository at this point in the history
Substitution of CC parameter homogenization.
  • Loading branch information
anttikantee authored Apr 8, 2018
2 parents ddcfbd7 + ad264fc commit a81e52f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions build-rr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ helpme ()
exit 1
}

CC=${CC:-cc}

BUILDRUMP=$(pwd)/buildrump.sh

# overriden by script if true
Expand Down Expand Up @@ -309,7 +311,7 @@ checktools ()
delay=5

# check that gcc is modern enough
vers=$(${CC:-cc} -E -dM - < /dev/null | LANG=C awk '
vers=$(${CC} -E -dM - < /dev/null | LANG=C awk '
/__GNUC__/ {version += 100*$3}
/__GNUC_MINOR__/ {version += $3}
END { print version; if (version) exit 0; exit 1; }') \
Expand All @@ -326,7 +328,7 @@ checktools ()
fi

# check that ld is modern enough
vers=$(${CC:-cc} -Wl,--version 2>&1 | LANG=C awk '
vers=$(${CC} -Wl,--version 2>&1 | LANG=C awk '
/GNU ld/{version += 100*$NF}
END { print version; if (version) exit 0; exit 1; }') \
|| die unable to probe ld version
Expand Down

0 comments on commit a81e52f

Please sign in to comment.