merged changes from RC_1_0

2014-11-14 09:35:39 +00:00
parent bfb0c4fe80
commit e1d0592a57
4 changed files with 16 additions and 13 deletions
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -53,7 +53,8 @@ packages = None

 if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:

-	del sys.argv[sys.argv.index('--bjam')]
+	if '--bjam' in sys.argv:
+		del sys.argv[sys.argv.index('--bjam')]

 	if not '--help' in sys.argv \
 		and not '--help-commands' in sys.argv: