Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx...

[android-x86/external-mesa.git] / scons / mslib_sa.py

diff --git a/scons/mslib_sa.py b/scons/mslib_sa.py
index c5ebdec..50d47ee 100644 (file)
--- 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']   = ''