git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix libgomp without --enable-languages=fortran. 

libgomp/:
	PR libgomp/41418
	* configure.ac: Set FC to "no" if $GFORTRAN starts with "no"
	or a hyphen (happens with fortran language disabled).
	* configure: Regenerate.

From-SVN: r152931
This commit is contained in:
Ralf Wildenhues 2009-10-17 07:34:47 +00:00 committed by Ralf Wildenhues
parent 3df9609a72
commit 0046b1a727
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgomp/ChangeLog
View File

@ -1,3 +1,10 @@
2009-10-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR libgomp/41418
* configure.ac: Set FC to "no" if $GFORTRAN starts with "no"
or a hyphen (happens with fortran language disabled).
* configure: Regenerate.
2009-09-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2009-09-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid 'head', * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid 'head',

19
libgomp/configure vendored
View File

@ -11340,7 +11340,12 @@ fi
# We need gfortran to compile parts of the library # We need gfortran to compile parts of the library
# We can't use AC_PROG_FC because it expects a fully working gfortran. # We can't use AC_PROG_FC because it expects a fully working gfortran.
#AC_PROG_FC(gfortran) #AC_PROG_FC(gfortran)
FC="$GFORTRAN" case `echo $GFORTRAN` in
-* | no* )
FC=no ;;
*)
FC="$GFORTRAN" ;;
esac
ac_ext=${ac_fc_srcext-f} ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
@ -12351,11 +12356,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12354: $lt_compile\"" >&5) (eval echo "\"\$as_me:12359: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err) (eval "$lt_compile" 2>conftest.err)
ac_status=$? ac_status=$?
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:12358: \$? = $ac_status" >&5 echo "$as_me:12363: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output. # So say no if there are warnings other than the usual output.
@ -12450,11 +12455,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12453: $lt_compile\"" >&5) (eval echo "\"\$as_me:12458: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:12457: \$? = $ac_status" >&5 echo "$as_me:12462: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
@ -12502,11 +12507,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'` -e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:12505: $lt_compile\"" >&5) (eval echo "\"\$as_me:12510: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err) (eval "$lt_compile" 2>out/conftest.err)
ac_status=$? ac_status=$?
cat out/conftest.err >&5 cat out/conftest.err >&5
echo "$as_me:12509: \$? = $ac_status" >&5 echo "$as_me:12514: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext if (exit $ac_status) && test -s out/conftest2.$ac_objext
then then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized

7
libgomp/configure.ac
View File

@ -142,7 +142,12 @@ AM_MAINTAINER_MODE
# We need gfortran to compile parts of the library # We need gfortran to compile parts of the library
# We can't use AC_PROG_FC because it expects a fully working gfortran. # We can't use AC_PROG_FC because it expects a fully working gfortran.
#AC_PROG_FC(gfortran) #AC_PROG_FC(gfortran)
FC="$GFORTRAN" case `echo $GFORTRAN` in
-* | no* )
FC=no ;;
*)
FC="$GFORTRAN" ;;
esac
AC_PROG_FC(gfortran) AC_PROG_FC(gfortran)
FCFLAGS="$FCFLAGS -Wall" FCFLAGS="$FCFLAGS -Wall"