Commit dac49009 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Add improved handling of libtool arguments.

parent 56ba5be7
......@@ -34,6 +34,10 @@ EXTRA_DIST = util/sunf95preproc-wrapper \
contrib/03ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.2.patch \
contrib/04ltmain-xlinker-patch/README \
contrib/04ltmain-xlinker-patch/ltmain-xlinker-patch.patch \
contrib/05macos-nagfor-patch/macos-nagfor.patch \
contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch \
contrib/07ltmain-early-xcompile-patch/README \
contrib/07ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch \
doc/Makefile \
doc/Doxyfile.in doc/README.build doc/cfortran.doc \
doc/cfortran.html doc/cfortran.txt doc/styleguide.txt \
......
This patch fixes a bug in libtool that leads to a fault when
-Xcompiler is used as first option of compiler flag variables like
CFLAGS and FCLAGS.
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -3300,7 +3300,8 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg=$arg
+ lastarg=$srcfile
+ srcfile=$arg
arg_mode=normal
;;
......@@ -14,7 +14,8 @@ case "$libtoolversion" in
contrib/03ltmain-ld-groups-patch/ltmain-ld-groups-libtool-2.4.6.patch \
contrib/04ltmain-xlinker-patch/ltmain-xlinker-patch.patch \
contrib/05macos-nagfor-patch/macos-nagfor.patch \
contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch)
contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch \
contrib/07ltmain-early-xcompile-patch/ltmain-early-xcompile-libtool-2.4.6.patch)
;;
2.4.2)
patches=(contrib/00nagfor-libtool-patch/nagfor-libtool.patch \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment