From d4dc3df3de37bf5f29712c13741329e20a7e3936 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 25 Jul 2015 23:10:48 +0000 Subject: [PATCH] Support PCH+LTO --- SConstruct | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 8c1798b30..8a2fa7251 100644 --- a/SConstruct +++ b/SConstruct @@ -230,9 +230,9 @@ class ConfigureTests: def _extend_successflags(self,k,v): self.successful_flags.setdefault(k, []).extend(v) def Compile(self,context,**kwargs): - if self.user_settings.lto: - self.Compile = self.Link - return self.Link(context, **kwargs) + self.Compile = self.Link if self.user_settings.lto else self._Compile + return self.Compile(context, **kwargs) + def _Compile(self,context,**kwargs): return self._Test(context,action=context.TryCompile, **kwargs) def Link(self,context,**kwargs): return self._Test(context,action=context.TryLink, **kwargs) @@ -865,7 +865,7 @@ U a{640}; @_implicit_test def check_pch(self,context): for how in [{'CXXFLAGS' : ['-x', 'c++-header']}]: - result = self.Compile(context, text='', msg='whether compiler supports pre-compiled headers', testflags=how) + result = self._Compile(context, text='', msg='whether compiler supports pre-compiled headers', testflags=how) if result: self.pch_flags = how return result