Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/configure b/configure 2index 36fcf67..39612f3 100755 3--- a/configure 4+++ b/configure 5@@ -143,6 +143,16 @@ firstcompiler = None 6 with open('compilers/default') as f: 7 for c in f.readlines(): 8 c = c.strip() 9+ if env_cc := os.getenv('CC'): 10+ c_as_list= c.split() 11+ # check if the compiler we're testing has the name inside the last 12+ # part of the CC env var 13+ # i.e. gcc == x86_64-linux-unknown-gnu-gcc 14+ # or gcc == gcc 15+ if c_as_list[0] == env_cc.split("-")[-1]: 16+ c_as_list[0] = env_cc 17+ c = ' '.join(c_as_list) 18+ log('patched command as %s' % c) 19 cv = compilerversion(c) 20 if cv == None: 21 log('skipping default compiler %s' % c) 22diff --git a/scripts-build/staticlib b/scripts-build/staticlib 23index 7b2fc92..a6bbe41 100755 24--- a/scripts-build/staticlib 25+++ b/scripts-build/staticlib 26@@ -4,6 +4,6 @@ lib="$1" 27 shift 28 29 rm -f package/lib/"$lib".a 30-ar cr package/lib/"$lib".a "$@" 31-ranlib package/lib/"$lib".a || : 32+${AR:-ar} cr package/lib/"$lib".a "$@" 33+${RANLIB:-ranlib} package/lib/"$lib".a || : 34 chmod 644 package/lib/"$lib".a