summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS4
-rwxr-xr-xconfigure1
-rw-r--r--configure.in1
3 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index fe85823a2d..48ef326d56 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.2.2?
Core and Builtins
-----------------
+- Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python
+ is compiled on Linux 3.
+
+
Library
-------
diff --git a/configure b/configure
index 508ae3463a..9d85e359b1 100755
--- a/configure
+++ b/configure
@@ -2997,6 +2997,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
irix646) MACHDEP="irix6";;
diff --git a/configure.in b/configure.in
index c4ad4e8908..3e60d8e016 100644
--- a/configure.in
+++ b/configure.in
@@ -290,6 +290,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
irix646) MACHDEP="irix6";;