Make mingw_path a member of WindowsTarget.
authorCarl Hetherington <cth@carlh.net>
Mon, 1 Dec 2014 15:08:26 +0000 (15:08 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 1 Dec 2014 15:08:26 +0000 (15:08 +0000)
cdist

diff --git a/cdist b/cdist
index 812f06d7471ab0f9efe1acac96ff0a7ab36a9b00..5f056eaeda4c76660cf72e2e6242acff8a9c0c96 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -331,12 +331,12 @@ class WindowsTarget(Target):
         else:
             self.mingw_name = 'x86_64'
 
-        mingw_path = '%s/%d/bin' % (config.get('mingw_prefix'), self.bits)
+        self.mingw_path = '%s/%d/bin' % (config.get('mingw_prefix'), self.bits)
         self.mingw_prefixes = ['/%s/%d' % (config.get('mingw_prefix'), self.bits), '%s/%d/%s-w64-mingw32' % (config.get('mingw_prefix'), bits, self.mingw_name)]
 
         self.set('PKG_CONFIG_LIBDIR', '%s/lib/pkgconfig' % self.windows_prefix)
         self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/bin/pkgconfig' % (self.directory, self.directory))
-        self.set('PATH', '%s/bin:%s:%s' % (self.windows_prefix, mingw_path, os.environ['PATH']))
+        self.set('PATH', '%s/bin:%s:%s' % (self.windows_prefix, self.mingw_path, os.environ['PATH']))
         self.set('CC', '%s-w64-mingw32-gcc' % self.mingw_name)
         self.set('CXX', '%s-w64-mingw32-g++' % self.mingw_name)
         self.set('LD', '%s-w64-mingw32-ld' % self.mingw_name)