Lenard Lindstrom avatar Lenard Lindstrom committed c14a9ce

Fix freetype6/libtool problem with resource object file

The freetype6 libtool rejects object files in its argument list.
Bypass this by passing the object file directly to the linker.
Also clean up a bug in the msvcr90.dll linkage preparation shell script.

Comments (0)

Files changed (1)

msys_build_deps.py

         return '-L' + p
     return ''
 
+def as_linker_option(p):
+    """Return as an ld library path argument"""
+    
+    if p:
+        return '-Wl,' + p
+    return ''
+
 def as_preprocessor_header_path(p):
     """Return as a C preprocessor header include path argument"""
     
     subsystem = ''
     if not options.subsystem_noforce:
         subsystem = '-mwindows'
+    # Need to make the resources object file an explicit linker option to
+    # bypass libtool (freetype).
     environ['LDFLAGS'] = merge_strings(environ.get('LDFLAGS', ''),
                                        as_linker_lib_path(lib_mp),
                                        as_linker_lib_path(msvcr_mp),
-                                       resources_mp,
+                                       as_linker_option(resources_mp),
                                        subsystem,
                                        sep=' ')
 
   ranlib libmsvcr90d.dll.a
   cp -f libmsvcr90d.dll.a "$BDMSVCR90"
   mv -f libmsvcr90d.dll.a "$BDMSVCR90/libmsvcrtd.dll.a"
-  mv -f manifest.o "$BDMSVCR90"
   
   # These definitions are taken from mingw-runtime-3.12 .
   # The file was generated with the following command:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.