diff -Nurd GalSim-1.5.1.orig/SConstruct GalSim-1.5.1/SConstruct --- GalSim-1.5.1.orig/SConstruct 2017-12-06 14:47:36.000000000 -0500 +++ GalSim-1.5.1/SConstruct 2023-03-18 04:44:28.000000000 -0400 @@ -24,6 +24,7 @@ import SCons import platform import distutils.sysconfig +import SCons.SConf from sys import stdout,stderr @@ -1119,9 +1120,15 @@ # is basically taken from parts of the code for TryBuild and TryRun. # First make the file name using the same counter as TryBuild uses: - from SCons.SConf import _ac_build_counter - f = "conftest_" + str(SCons.SConf._ac_build_counter) - SCons.SConf._ac_build_counter = SCons.SConf._ac_build_counter + 1 + if isinstance(SCons.SConf._ac_build_counter, int): + # scons version < 4 + f = "conftest_" + str(SCons.SConf._ac_build_counter) + SCons.SConf._ac_build_counter += 1 + else: + # scons version == 4 + testSig = SCons.Util.MD5signature(pname) + f = "conftest_" + str(SCons.SConf._ac_build_counter[testSig]) + SCons.SConf._ac_build_counter[testSig] += 1 config.sconf.pspawn = config.sconf.env['PSPAWN'] save_spawn = config.sconf.env['SPAWN']