tree c5026b1739ba7786bc15fca82db982b2f207e6dd
parent a107819d0c9e0c4432b34049df2958d3b0dd0013
author Ronald Oussoren <ronaldoussoren@mac.com> 1271617727 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> 1271617727 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4080192

Merged revisions 80191 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80191 | ronald.oussoren | 2010-04-18 21:07:43 +0200 (Sun, 18 Apr 2010) | 13 lines

  Merged revisions 80187 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80187 | ronald.oussoren | 2010-04-18 19:59:37 +0200 (Sun, 18 Apr 2010) | 6 lines

    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.
  ........
................