Fix previous.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index 9c1d1bd3d147583798766eb204c50bb5a685f714..c17c1dc86a28680f40cb49ceb63f085a8bd42bc1 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -593,6 +593,9 @@ class WindowsDockerTarget(DockerTarget):
     def __init__(self, bits, directory, environment_version):
         super(WindowsDockerTarget, self).__init__('windows', directory)
         self.bits = bits
+        # This was used to differentiate "normal" Windows from XP, and is no longer important,
+        # but old cscripts still look for it
+        self.version = None
 
         self.tool_path = '%s/usr/bin' % config.get('mxe_prefix')
         if self.bits == 32:
@@ -915,12 +918,17 @@ class SourceTarget(Target):
 
 class LocalTarget(Target):
     """Build on the local machine with its environment"""
-    def __init__(self, work):
-        super(LocalTarget, self).__init__('local', work)
+    def __init__(self, work, dependencies_only=False):
+        super(LocalTarget, self).__init__('linux', work, dependencies_only=dependencies_only)
         # Hack around ffmpeg.git which sees that the target isn't windows/osx and then assumes
         # distro will be there.
         self.distro = None
+        self.detail = None
+        self.bits = 64
         self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/bin/pkgconfig' % (self.directory, self.directory))
+        self.append_with_colon('LD_LIBRARY_PATH', '%s/lib' % self.directory)
+        self.set('CXXFLAGS', '-I%s/include' % self.directory)
+        self.set('LINKFLAGS', '-L%s/lib' % self.directory)
 
     def command(self, c):
         log_normal('host -> %s' % c)