summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-05-01 21:18:27 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-05-01 21:18:27 (GMT)
commit8966c99bb5a6c15d9963a5ad394f1ff01c036164 (patch)
tree70dadeee740bc815ed555f509f18158fbdc4a782
parent7fff09629811ff43d77aca27c6b999634f775fee (diff)
downloadcpython-8966c99bb5a6c15d9963a5ad394f1ff01c036164.zip
cpython-8966c99bb5a6c15d9963a5ad394f1ff01c036164.tar.gz
cpython-8966c99bb5a6c15d9963a5ad394f1ff01c036164.tar.bz2
Merged revisions 72180 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72180 | antoine.pitrou | 2009-05-01 23:16:14 +0200 (ven., 01 mai 2009) | 4 lines Issue #5726: Make Modules/ld_so_aix return the actual exit code of the linker, rather than always exit successfully. Patch by Floris Bruynooghe. ........
-rw-r--r--Misc/NEWS3
-rwxr-xr-xModules/ld_so_aix3
2 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a5e2e6..ba398c7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -892,6 +892,9 @@ Tools/Demos
Build
-----
+- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the
+ linker, rather than always exit successfully. Patch by Floris Bruynooghe.
+
- Issue #4587: Add configure option --with-dbmliborder=db1:db2:... to specify
the order that backends for the dbm extension are checked.
diff --git a/Modules/ld_so_aix b/Modules/ld_so_aix
index 76afa6e..6b83823 100755
--- a/Modules/ld_so_aix
+++ b/Modules/ld_so_aix
@@ -181,7 +181,10 @@ $makexp $expfile "$objfile" $objs
# Perform the link.
#echo $CC $CCOPT $CCARGS
$CC $CCOPT $CCARGS
+retval=$?
# Delete the module's export list file.
# Comment this line if you need it.
rm -f $expfile
+
+exit $retval