# Author: Alecsandru Patrascu <alecsandru.patrascu@intel.com>
diff -r 43567d214534 Lib/distutils/tests/test_sysconfig.py
--- a/Lib/distutils/tests/test_sysconfig.py	Mon Apr 18 10:29:19 2016 +0200
+++ b/Lib/distutils/tests/test_sysconfig.py	Mon Apr 18 16:40:11 2016 +0300
@@ -129,8 +129,12 @@
         import sysconfig as global_sysconfig
         self.assertEqual(global_sysconfig.get_config_var('CFLAGS'),
                          sysconfig.get_config_var('CFLAGS'))
-        self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'),
-                         sysconfig.get_config_var('LDFLAGS'))
+        # In case LTO is used, some flags will be added to LTO_FLAGS config var
+        lto = sysconfig.get_config_var('LTO_FLAGS')
+        if lto != '':
+            lto = ' ' + lto
+        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),
+                         sysconfig.get_config_var('LDSHARED') + lto)
 
     @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'),
                      'compiler flags customized')
@@ -152,8 +156,12 @@
         import sysconfig as global_sysconfig
         if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
             self.skipTest('compiler flags customized')
+        # In case LTO is used, some flags will be added to LTO_FLAGS config var
+        lto = sysconfig.get_config_var('LTO_FLAGS')
+        if lto != '':
+            lto = ' ' + lto
         self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),
-                         sysconfig.get_config_var('LDSHARED'))
+                         sysconfig.get_config_var('LDSHARED') + lto)
         self.assertEqual(global_sysconfig.get_config_var('CC'),
                          sysconfig.get_config_var('CC'))
 
diff -r 43567d214534 Makefile.pre.in
--- a/Makefile.pre.in	Mon Apr 18 10:29:19 2016 +0200
+++ b/Makefile.pre.in	Mon Apr 18 16:40:11 2016 +0300
@@ -43,6 +43,7 @@
 HGVERSION=	@HGVERSION@
 HGTAG=		@HGTAG@
 HGBRANCH=	@HGBRANCH@
+LTO_FLAGS=@LTOFLAGS@
 PGO_PROF_GEN_FLAG=@PGO_PROF_GEN_FLAG@
 PGO_PROF_USE_FLAG=@PGO_PROF_USE_FLAG@
 LLVM_PROF_MERGER=@LLVM_PROF_MERGER@
@@ -504,7 +505,7 @@
 	$(MAKE) profile-removal
 
 build_all_generate_profile:
-	$(MAKE) all CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LIBS="$(LIBS)"
+	$(MAKE) all CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_GEN_FLAG) $(LTO_FLAGS)" LDFLAGS="$(LDFLAGS) $(PGO_PROF_GEN_FLAG) $(LTO_FLAGS)" LIBS="$(LIBS)"
 
 run_profile_task:
 	: # FIXME: can't run for a cross build
@@ -514,7 +515,7 @@
 	$(LLVM_PROF_MERGER)
 
 build_all_use_profile:
-	$(MAKE) all CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_USE_FLAG) @LTOFLAGS@" LDFLAGS="$(LDFLAGS) @LTOFLAGS@"
+	$(MAKE) all CFLAGS_NODIST="$(CFLAGS) $(PGO_PROF_USE_FLAG) $(LTO_FLAGS)" LDFLAGS="$(LDFLAGS) $(LTO_FLAGS)"
 
 # Compile and run with gcov
 .PHONY=coverage coverage-lcov coverage-report