X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fmslib_sa.py;h=50d47ee37bd95a7ee59d9517633794e65cf855e1;hb=dc9705d12d162ba6d087eb762e315de9f97bc456;hp=c5ebdec273f233b5655c5530702402e60d12726d;hpb=e80d1e367a25af406c7f2327646c0aa699962fe8;p=mesa.git diff --git a/scons/mslib_sa.py b/scons/mslib_sa.py index c5ebdec273f..50d47ee37bd 100644 --- a/scons/mslib_sa.py +++ b/scons/mslib_sa.py @@ -118,12 +118,10 @@ def generate(env): if env.Detect('lib'): env['AR'] = 'lib' - elif env.Detect('link'): + else: # Recent WINDDK versions do not ship with lib. env['AR'] = 'link /lib' env['TEMPFILE'] = TempFileMunge - else: - raise SCons.Errors.InternalError, "lib and link not found" env['ARFLAGS'] = SCons.Util.CLVar('/nologo') env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}" env['LIBPREFIX'] = ''