From c72bf02991988968f3aa9ececadaba7d0038e7a4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 5 Oct 2014 20:58:32 +0100 Subject: [PATCH] Wipe CPPFLAGS for all targets. --- cdist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cdist b/cdist index b6e365d..e99ff80 100755 --- a/cdist +++ b/cdist @@ -346,6 +346,7 @@ class LinuxTarget(Target): self.chroot_prefix = '%s/%s' % (config.get('linux_chroot_prefix'), self.chroot) self.set('CXXFLAGS', '-I%s/include' % self.directory) + self.set('CPPFLAGS', '') self.set('LINKFLAGS', '-L%s/lib' % self.directory) self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:/usr/local/lib/pkgconfig' % self.directory) self.set('PATH', '%s:/usr/local/bin' % (os.environ['PATH'])) @@ -380,6 +381,7 @@ class OSXSingleTarget(OSXTarget): # Environment variables self.set('CFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, enviro, flags)) + self.set('CPPFLAGS', '') self.set('CXXFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, enviro, flags)) self.set('LDFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, enviro, flags)) self.set('LINKFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, enviro, flags)) -- 2.30.2