diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-10-17 07:34:47 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2009-10-17 07:34:47 +0000 |
| commit | 0046b1a727f73f0848733e28219069426b2dc218 (patch) | |
| tree | 3c3b85774e017339e7f9e236a62f97d739356493 | |
| parent | 3df9609a72613e190c828cb991277492eede618b (diff) | |
| download | gcc-0046b1a727f73f0848733e28219069426b2dc218.zip gcc-0046b1a727f73f0848733e28219069426b2dc218.tar.gz gcc-0046b1a727f73f0848733e28219069426b2dc218.tar.bz2 | |
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
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rwxr-xr-x | libgomp/configure | 19 | ||||
| -rw-r--r-- | libgomp/configure.ac | 7 |
3 files changed, 25 insertions, 8 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 682da80..ac9bb19 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -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> * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid 'head', diff --git a/libgomp/configure b/libgomp/configure index d138f68..a0a93d6 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -11340,7 +11340,12 @@ fi # We need gfortran to compile parts of the library # We can't use AC_PROG_FC because it expects a fully working gfortran. #AC_PROG_FC(gfortran) -FC="$GFORTRAN" +case `echo $GFORTRAN` in + -* | no* ) + FC=no ;; + *) + FC="$GFORTRAN" ;; +esac ac_ext=${ac_fc_srcext-f} 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' @@ -12351,11 +12356,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -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) ac_status=$? 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 # The compiler can only warn and ignore the option if not recognized # 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: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -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) ac_status=$? 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 then # 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: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -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) ac_status=$? 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 then # The compiler can only warn and ignore the option if not recognized diff --git a/libgomp/configure.ac b/libgomp/configure.ac index e0bdf2b..792c9f5 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -142,7 +142,12 @@ AM_MAINTAINER_MODE # We need gfortran to compile parts of the library # We can't use AC_PROG_FC because it expects a fully working gfortran. #AC_PROG_FC(gfortran) -FC="$GFORTRAN" +case `echo $GFORTRAN` in + -* | no* ) + FC=no ;; + *) + FC="$GFORTRAN" ;; +esac AC_PROG_FC(gfortran) FCFLAGS="$FCFLAGS -Wall" |