Look for bitcode for library input files in other places

If an input file is not bitcode and looks like a library file, treat it
as library so we can look for it in other places.

In conjuction with the previous change, now we can just drop, eg,
libfreetype.dylib bitcode in emscripten/system/lib and "dynamic" linking
would succeed.

Perhaps this can be changed to only lookup in emscripten/system/lib
instead of all lib_dirs, but this is a good start.

1 files changed, 11 insertions, 0 deletions

diff --git a/emcc b/emcc
index 740bfe96..d50c6fb9 100755
--- a/emcc
+++ b/emcc
@@ -554,6 +554,16 @@ try:
           # this should be bitcode, make sure it is valid
           if arg.endswith(ASSEMBLY_SUFFIXES) or shared.Building.is_bitcode(arg):
             input_files.append(arg)
+          elif arg.endswith(STATICLIB_SUFFIXES + DYNAMICLIB_SUFFIXES):
+            # if it's not, and it's a library, just add it to libs to find later
+            l = unsuffixed_basename(arg)
+            for prefix in LIB_PREFIXES:
+              if not prefix: continue
+              if l.startswith(prefix):
+                l = l[len(prefix):]
+                break;
+            libs.append(l)
+            newargs[i] = ''
           else:
             print >> sys.stderr, 'emcc: %s: warning: Not valid LLVM bitcode' % arg
       else:
@@ -564,6 +574,7 @@ try:
     elif arg.startswith('-l'):
       libs.append(arg[2:])
       newargs[i] = ''
+
   newargs = [ arg for arg in newargs if arg is not '' ]
 
   # Find library files