From 974eb5eace4187c81f2bc13022260467eb72c82b Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 18 Apr 2010 17:59:37 +0000
Subject: [PATCH] Add the OSX universal binary related options to CFLAGS
 instead of BASECFLAGS.

This fixes issue 8366 and is needed due to
changes introduced in the fix for issue 1628484.
---
 configure    | 13 +++++++------
 configure.in | 11 ++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index f58fccf09e..4e8a420221 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 79652 .
+# From configure.in Revision: 79902 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -4816,11 +4816,12 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
 		 fi
 
 
-		BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
-		tgt=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
-		if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then
-			CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
-			CPPFLAGS="-isysroot ${UNIVERSALSDK}"
+		CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
+		if test "${UNIVERSALSDK}" != "/"
+		then
+			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
 		fi
 
 	    fi
diff --git a/configure.in b/configure.in
index 68e6d5af95..a7a08147c1 100644
--- a/configure.in
+++ b/configure.in
@@ -1052,11 +1052,12 @@ yes)
 		 fi
 
 
-		BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
-		tgt=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
-		if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then
-			CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
-			CPPFLAGS="-isysroot ${UNIVERSALSDK}"
+		CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
+		if test "${UNIVERSALSDK}" != "/" 
+		then
+			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
 		fi
 
 	    fi
-- 
2.50.0