diff options
author | John Stebbins <[email protected]> | 2019-04-16 08:02:20 -0600 |
---|---|---|
committer | John Stebbins <[email protected]> | 2019-04-16 08:02:20 -0600 |
commit | e2d88fc3e1bfbdca9289876948f7f25f315e537b (patch) | |
tree | 31cd8033365eab1c27a59ea252d57d45332fb0ec /make/configure.py | |
parent | 9f575664d3db2e90bb75c4fed512ef2f810236b1 (diff) |
configure: Add comments to make lib checks more readable
With all the quoted code fragments, it is difficult to see indentation
that separates osx, mingw, and linux specific tests. The comments make
this more clear
Diffstat (limited to 'make/configure.py')
-rw-r--r-- | make/configure.py | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/make/configure.py b/make/configure.py index b4f891a14..7523e4679 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1677,13 +1677,19 @@ try: options.enable_vce = IfHost(options.enable_vce, '*-*-mingw*', none=False).value - ## fail on missing or old nasm where needed + ######################################### + ## OSX specific library and tool checks + ######################################### if build_tuple.match( '*-*-darwin*' ) or options.cross: + ## fail on missing or old nasm where needed if Tools.nasm.fail: raise AbortError( 'error: nasm missing\n' ) elif Tools.nasm.version.inadequate(): raise AbortError( 'error: minimum required nasm version is %s and %s is %s\n' % ('.'.join([str(i) for i in Tools.nasm.version.minversion]),Tools.nasm.pathname,Tools.nasm.version.svers) ) + ######################################### + ## MinGW specific library and tool checks + ######################################### if host_tuple.system == 'mingw': dlfcn_test = """ #include <dlfcn.h> @@ -1820,23 +1826,9 @@ int main () strtok_r = LDProbe( 'static strtok_r', '%s -static' % Tools.gcc.pathname, '', strtok_r_test ) strtok_r.run() - strerror_r_test = """ -#include <string.h> - -int main() -{ - /* some implementations fail if buf is less than 80 characters - so size it appropriately */ - char errstr[128]; - /* some implementations fail if err == 0 */ - strerror_r(1, errstr, 127); - return 0; -} -""" - - strerror_r = LDProbe( 'strerror_r', '%s' % Tools.gcc.pathname, '', strerror_r_test ) - strerror_r.run() - + ######################################### + ## Linux specific library and tool checks + ######################################### if host_tuple.system == 'linux': if options.enable_numa: numa_test = """ @@ -1853,6 +1845,25 @@ return 0; 'numa', numa_test, abort=True ) numa.run() + ######################################### + ## Common library and tool checks + ######################################### + strerror_r_test = """ +#include <string.h> + +int main() +{ + /* some implementations fail if buf is less than 80 characters + so size it appropriately */ + char errstr[128]; + /* some implementations fail if err == 0 */ + strerror_r(1, errstr, 127); + return 0; +} +""" + + strerror_r = LDProbe( 'strerror_r', '%s' % Tools.gcc.pathname, '', strerror_r_test ) + strerror_r.run() ## cfg hook before doc prep cfg.doc_ready() |