properly check for libx.so.1.2.3 types when deciding what to link in statically, and improve testing for that; fixes #1886

2 files changed, 54 insertions, 46 deletions

diff --git a/emcc b/emcc
index 4803b813..39aa0ced 100755
--- a/emcc
+++ b/emcc
@@ -1132,12 +1132,13 @@ try:
             break
         if found: break
       if found: break
+    if not found: logging.warning('emcc: cannot find library "%s"' % lib)
 
   # If not compiling to JS, then we are compiling to an intermediate bitcode objects or library, so
   # ignore dynamic linking, since multiple dynamic linkings can interfere with each other
   if not filename_type_suffix(target) in JS_CONTAINING_SUFFIXES or ignore_dynamic_linking:
     def check(input_file):
-      if input_file.endswith(DYNAMICLIB_ENDINGS):
+      if filename_type_ending(input_file) in DYNAMICLIB_ENDINGS:
         if not ignore_dynamic_linking: logging.warning('ignoring dynamic library %s because not compiling to JS or HTML, remember to link it when compiling to JS or HTML at the end' % os.path.basename(input_file))
         return False
       else:
diff --git a/tests/test_other.py b/tests/test_other.py
index c26052a3..0c325c74 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -1374,59 +1374,66 @@ f.close()
     assert output == ''
 
   def test_multidynamic_link(self):
-    # Linking the same dynamic library in will error, normally, since we statically link it, causing dupe symbols
-    # A workaround is to use --ignore-dynamic-linking, see emcc --help for details
+    # Linking the same dynamic library in statically will error, normally, since we statically link it, causing dupe symbols
 
-    open(os.path.join(self.get_dir(), 'main.cpp'), 'w').write(r'''
-      #include <stdio.h>
-      extern void printey();
-      extern void printother();
-      int main() {
-        printf("*");
-        printey();
-        printf("\n");
-        printother();
-        printf("\n");
-        printf("*");
-        return 0;
-      }
-    ''')
+    def test(link_cmd, lib_suffix=''):
+      print link_cmd, lib_suffix
 
-    try:
-      os.makedirs(os.path.join(self.get_dir(), 'libdir'));
-    except:
-      pass
+      self.clear()
 
-    open(os.path.join(self.get_dir(), 'libdir', 'libfile.cpp'), 'w').write('''
-      #include <stdio.h>
-      void printey() {
-        printf("hello from lib");
-      }
-    ''')
+      open(os.path.join(self.get_dir(), 'main.cpp'), 'w').write(r'''
+        #include <stdio.h>
+        extern void printey();
+        extern void printother();
+        int main() {
+          printf("*");
+          printey();
+          printf("\n");
+          printother();
+          printf("\n");
+          printf("*");
+          return 0;
+        }
+      ''')
 
-    open(os.path.join(self.get_dir(), 'libdir', 'libother.cpp'), 'w').write('''
-      #include <stdio.h>
-      extern void printey();
-      void printother() {
-        printf("|");
-        printey();
-        printf("|");
-      }
-    ''')
+      try:
+        os.makedirs(os.path.join(self.get_dir(), 'libdir'));
+      except:
+        pass
+
+      open(os.path.join(self.get_dir(), 'libdir', 'libfile.cpp'), 'w').write('''
+        #include <stdio.h>
+        void printey() {
+          printf("hello from lib");
+        }
+      ''')
+
+      open(os.path.join(self.get_dir(), 'libdir', 'libother.cpp'), 'w').write('''
+        #include <stdio.h>
+        extern void printey();
+        void printother() {
+          printf("|");
+          printey();
+          printf("|");
+        }
+      ''')
 
-    compiler = [PYTHON, EMCC]
+      compiler = [PYTHON, EMCC]
 
-    # Build libfile normally into an .so
-    Popen(compiler + [os.path.join(self.get_dir(), 'libdir', 'libfile.cpp'), '-o', os.path.join(self.get_dir(), 'libdir', 'libfile.so')]).communicate()
-    # Build libother and dynamically link it to libfile
-    Popen(compiler + [os.path.join(self.get_dir(), 'libdir', 'libother.cpp'), '-L' + os.path.join(self.get_dir(), 'libdir'), '-lfile', '-o', os.path.join(self.get_dir(), 'libdir', 'libother.so')]).communicate()
-    # Build the main file, linking in both the libs
-    Popen(compiler + [os.path.join(self.get_dir(), 'main.cpp'), '-L' + os.path.join(self.get_dir(), 'libdir'), '-lfile', '-lother', '-c']).communicate()
+      # Build libfile normally into an .so
+      Popen(compiler + [os.path.join(self.get_dir(), 'libdir', 'libfile.cpp'), '-o', os.path.join(self.get_dir(), 'libdir', 'libfile.so' + lib_suffix)]).communicate()
+      # Build libother and dynamically link it to libfile
+      Popen(compiler + [os.path.join(self.get_dir(), 'libdir', 'libother.cpp')] + link_cmd + ['-o', os.path.join(self.get_dir(), 'libdir', 'libother.so')]).communicate()
+      # Build the main file, linking in both the libs
+      Popen(compiler + [os.path.join(self.get_dir(), 'main.cpp')] + link_cmd + ['-lother', '-c']).communicate()
+      print '...'
+      # The normal build system is over. We need to do an additional step to link in the dynamic libraries, since we ignored them before
+      Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.o')] + link_cmd + ['-lother']).communicate()
 
-    # The normal build system is over. We need to do an additional step to link in the dynamic libraries, since we ignored them before
-    Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.o'), '-L' + os.path.join(self.get_dir(), 'libdir'), '-lfile', '-lother']).communicate()
+      self.assertContained('*hello from lib\n|hello from lib|\n*', run_js(os.path.join(self.get_dir(), 'a.out.js')))
 
-    self.assertContained('*hello from lib\n|hello from lib|\n*', run_js(os.path.join(self.get_dir(), 'a.out.js')))
+    test(['-L' + os.path.join(self.get_dir(), 'libdir'), '-lfile']) # -l, auto detection from library path
+    test(['-L' + os.path.join(self.get_dir(), 'libdir'), os.path.join(self.get_dir(), 'libdir', 'libfile.so.3.1.4.1.5.9')], '.3.1.4.1.5.9') # handle libX.so.1.2.3 as well
 
   def test_js_link(self):
     open(os.path.join(self.get_dir(), 'main.cpp'), 'w').write('''