changeset 12753:00fbb05f099c stable

Backout 2c54fde0f397 on stable; broke Octave-Forge packages
author Jordi Gutiérrez Hermoso <jordigh@gmail.com>
date Sat, 18 Jun 2011 22:07:34 -0500
parents d9b084a3d4b0
children 5ee4fc58585f
files scripts/miscellaneous/mkoctfile.m src/mkoctfile.in
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/mkoctfile.m	Sat Jun 18 07:47:04 2011 -0700
+++ b/scripts/miscellaneous/mkoctfile.m	Sat Jun 18 22:07:34 2011 -0500
@@ -51,13 +51,12 @@
 ## Add the run-time path to the link command.
 ##
 ## @item -Wl,@dots{}
-## Pass flags through the linker e.g. "-Wl,-rpath=@dots{}".
+## Pass flags though the linker like "-Wl,-rpath=@dots{}".
 ## The quotes are needed since commas are interpreted as command
 ## separators.
 ##
-## @item -W,@dots{}
-## Pass flags through the compiler, e.g. "-W,-O2". The quotes are needed
-## since commas are interpreted as command separators.
+## @item -W@dots{}
+## Pass flags though the compiler like "-Wa,OPTION".
 ##
 ## @item -c
 ## Compile but do not link.
--- a/src/mkoctfile.in	Sat Jun 18 07:47:04 2011 -0700
+++ b/src/mkoctfile.in	Sat Jun 18 22:07:34 2011 -0500
@@ -336,8 +336,8 @@
       incflags="$incflags -I."
       output_ext=".mex"
     ;;
-    -W,*)
-      pass_on_options="$pass_on_options ${1:3}"
+    -W*)
+      pass_on_options="$pass_on_options $1"
     ;;
     *)
       echo "mkoctfile: unrecognized argument $1" 1>&2