wscript: add LIBRARY_PATH for library detection

MinGW GCC seems to ignore LIBRARY_PATH which causes problem
when some libraries not using pkg-config were installed to
local directory

2 files changed, 4 insertions, 0 deletions

diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
index bf8e5a0b00..8ed06e5b24 100644
--- a/waftools/checks/custom.py
+++ b/waftools/checks/custom.py
@@ -50,6 +50,8 @@ def check_iconv(ctx, dependency_identifier):
     if ctx.env.DEST_OS == 'openbsd' or ctx.env.DEST_OS == 'freebsd':
         args['cflags'] = '-I/usr/local/include'
         args['linkflags'] = '-L/usr/local/lib'
+    elif ctx.env.DEST_OS == 'win32':
+        args['linkflags'] = " ".join(['-L' + x for x in ctx.env.LIBRARY_PATH])
     checkfn = check_cc(**args)
     return check_libs(libs, checkfn)(ctx, dependency_identifier)
 
diff --git a/wscript b/wscript
index ab853e7ad8..789baae4a2 100644
--- a/wscript
+++ b/wscript
@@ -989,6 +989,8 @@ def configure(ctx):
     ctx.find_program(windres,     var='WINDRES',   mandatory=False)
     ctx.find_program('perl',      var='BIN_PERL',  mandatory=False)
 
+    ctx.add_os_flags('LIBRARY_PATH')
+
     ctx.load('compiler_c')
     ctx.load('waf_customizations')
     ctx.load('dependencies')