|
|
@ -602,7 +602,10 @@ class PkgConfigDependency(ExternalDependency): |
|
|
|
# Libraries that are provided by the toolchain or are not found by |
|
|
|
# Libraries that are provided by the toolchain or are not found by |
|
|
|
# find_library() will be added with -L -l pairs. |
|
|
|
# find_library() will be added with -L -l pairs. |
|
|
|
for lib in self._convert_mingw_paths(shlex.split(out)): |
|
|
|
for lib in self._convert_mingw_paths(shlex.split(out)): |
|
|
|
if lib.startswith('-L'): |
|
|
|
if lib.startswith(('-L-l', '-L-L')): |
|
|
|
|
|
|
|
# These are D language arguments, add them as-is |
|
|
|
|
|
|
|
pass |
|
|
|
|
|
|
|
elif lib.startswith('-L'): |
|
|
|
libpaths.add(lib[2:]) |
|
|
|
libpaths.add(lib[2:]) |
|
|
|
continue |
|
|
|
continue |
|
|
|
elif lib.startswith('-l'): |
|
|
|
elif lib.startswith('-l'): |
|
|
@ -610,7 +613,8 @@ class PkgConfigDependency(ExternalDependency): |
|
|
|
args = self.clib_compiler.find_library(lib[2:], self.env, |
|
|
|
args = self.clib_compiler.find_library(lib[2:], self.env, |
|
|
|
list(libpaths), libtype) |
|
|
|
list(libpaths), libtype) |
|
|
|
# If the project only uses a non-clib language such as D, Rust, |
|
|
|
# If the project only uses a non-clib language such as D, Rust, |
|
|
|
# C#, Python, etc, all we can do is limp along. |
|
|
|
# C#, Python, etc, all we can do is limp along by adding the |
|
|
|
|
|
|
|
# arguments as-is and then adding the libpaths at the end. |
|
|
|
else: |
|
|
|
else: |
|
|
|
args = None |
|
|
|
args = None |
|
|
|
if args: |
|
|
|
if args: |
|
|
|