mirror of https://gitlab.com/QEF/q-e.git
Yesterday's changes to configure were not that smart after all:
changing cross_compilation may have unexpected side effects. Now ranlib is set to echo only if a true corss compilation is performed git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3516 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz
parent
3c0d2a794b
commit
6595b18056
|
|
@ -43,10 +43,10 @@ script. It will (try to) detect compilers and libraries available on
|
|||
your machine, and set up things accordingly.
|
||||
Presently it is expected to work on most Linux 32- and 64-bit (Itanium
|
||||
and Opteron) PCs and clusters, IBM SP machines, SGI Origin, some
|
||||
HP-Compaq Alpha machines, Cray X1, Mac OS X, MS-Windows PCs, NEC SX6.
|
||||
It may work with some assistance also on other architectures (see
|
||||
below). If it fails and you do not manage to convince it to work,
|
||||
see the MANUAL INSTALLATION section below.
|
||||
HP-Compaq Alpha machines, Cray X1, Mac OS X, MS-Windows PCs, NEC SX6
|
||||
(with cross compilation). It may work with some assistance also on
|
||||
other architectures (see below). If it fails and you do not manage
|
||||
to convince it to work, see the MANUAL INSTALLATION section below.
|
||||
|
||||
For cross-compilation, you have to specify the target machine with the
|
||||
"--host" option (see below). This feature hasn't been tested
|
||||
|
|
|
|||
|
|
@ -1347,7 +1347,6 @@ arflags_dynamic=$ARFLAGS_DYNAMIC
|
|||
includefftw=$INCLUDEFFTW
|
||||
pgplot_libs=$PGPLOT_LIBS
|
||||
|
||||
|
||||
# command-line arguments
|
||||
for arg in $*
|
||||
do
|
||||
|
|
@ -1425,10 +1424,13 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
# would fail because they can't run the compiled executables.
|
||||
# to work around that, let's pretend we are cross-compiling even if we aren't
|
||||
# !!! this relies on undocumented Autoconf behavior !!!
|
||||
if test "$host" = "" ; then host=$build ; fi
|
||||
|
||||
# this is our internal variable saying if we are REALLY cross-compiling
|
||||
cross_compiling=no
|
||||
# This is used to distinguish between true and fake cross compilation
|
||||
# (only on NEC SX6 actually)
|
||||
if test "$host" != "" ; then ranlib=echo; fi
|
||||
|
||||
cross_compiling=yes
|
||||
if test "$host" = "" ; then host=$build; fi
|
||||
|
||||
# identify architecture
|
||||
if test "$arch" = ""
|
||||
|
|
@ -1493,7 +1495,6 @@ sparc )
|
|||
crayx1 )
|
||||
try_f90="ftn $try_f90"
|
||||
try_dflags="-D__X1"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
macppc )
|
||||
try_mpif90="mpxlf90 mpf90"
|
||||
|
|
@ -1514,7 +1515,6 @@ necsx )
|
|||
try_ar="sxar"
|
||||
try_arflags="rv"
|
||||
try_arflags_dynamic="rv"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
* )
|
||||
{ echo "$as_me:$LINENO: WARNING: unsupported architecture?" >&5
|
||||
|
|
@ -9463,11 +9463,9 @@ else
|
|||
fi
|
||||
echo setting FDFLAGS... $fdflags
|
||||
|
||||
if test "$cross_compiling" = "yes"
|
||||
if test "$ranlib" != "echo"
|
||||
then
|
||||
ranlib=echo
|
||||
else
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
|
|
|
|||
18
configure.ac
18
configure.ac
|
|
@ -38,7 +38,6 @@ arflags_dynamic=$ARFLAGS_DYNAMIC
|
|||
includefftw=$INCLUDEFFTW
|
||||
pgplot_libs=$PGPLOT_LIBS
|
||||
|
||||
|
||||
# command-line arguments
|
||||
for arg in $*
|
||||
do
|
||||
|
|
@ -60,10 +59,13 @@ AC_CANONICAL_BUILD
|
|||
# would fail because they can't run the compiled executables.
|
||||
# to work around that, let's pretend we are cross-compiling even if we aren't
|
||||
# !!! this relies on undocumented Autoconf behavior !!!
|
||||
if test "$host" = "" ; then host=$build ; fi
|
||||
|
||||
# this is our internal variable saying if we are REALLY cross-compiling
|
||||
cross_compiling=no
|
||||
# This is used to distinguish between true and fake cross compilation
|
||||
# (only on NEC SX6 actually)
|
||||
if test "$host" != "" ; then ranlib=echo; fi
|
||||
|
||||
cross_compiling=yes
|
||||
if test "$host" = "" ; then host=$build; fi
|
||||
|
||||
# identify architecture
|
||||
if test "$arch" = ""
|
||||
|
|
@ -128,7 +130,6 @@ sparc )
|
|||
crayx1 )
|
||||
try_f90="ftn $try_f90"
|
||||
try_dflags="-D__X1"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
macppc )
|
||||
try_mpif90="mpxlf90 mpf90"
|
||||
|
|
@ -149,7 +150,6 @@ necsx )
|
|||
try_ar="sxar"
|
||||
try_arflags="rv"
|
||||
try_arflags_dynamic="rv"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
* )
|
||||
AC_MSG_WARN(unsupported architecture?)
|
||||
|
|
@ -1326,11 +1326,9 @@ else
|
|||
fi
|
||||
echo setting FDFLAGS... $fdflags
|
||||
|
||||
if test "$cross_compiling" = "yes"
|
||||
if test "$ranlib" != "echo"
|
||||
then
|
||||
ranlib=echo
|
||||
else
|
||||
AC_CHECK_PROG(ranlib,ranlib,ranlib,echo)
|
||||
AC_CHECK_PROG(ranlib,ranlib,ranlib,echo)
|
||||
fi
|
||||
echo setting RANLIB... $ranlib
|
||||
|
||||
|
|
|
|||
|
|
@ -1347,7 +1347,6 @@ arflags_dynamic=$ARFLAGS_DYNAMIC
|
|||
includefftw=$INCLUDEFFTW
|
||||
pgplot_libs=$PGPLOT_LIBS
|
||||
|
||||
|
||||
# command-line arguments
|
||||
for arg in $*
|
||||
do
|
||||
|
|
@ -1425,10 +1424,13 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
# would fail because they can't run the compiled executables.
|
||||
# to work around that, let's pretend we are cross-compiling even if we aren't
|
||||
# !!! this relies on undocumented Autoconf behavior !!!
|
||||
if test "$host" = "" ; then host=$build ; fi
|
||||
|
||||
# this is our internal variable saying if we are REALLY cross-compiling
|
||||
cross_compiling=no
|
||||
# This is used to distinguish between true and fake cross compilation
|
||||
# (only on NEC SX6 actually)
|
||||
if test "$host" != "" ; then ranlib=echo; fi
|
||||
|
||||
cross_compiling=yes
|
||||
if test "$host" = "" ; then host=$build; fi
|
||||
|
||||
# identify architecture
|
||||
if test "$arch" = ""
|
||||
|
|
@ -1493,7 +1495,6 @@ sparc )
|
|||
crayx1 )
|
||||
try_f90="ftn $try_f90"
|
||||
try_dflags="-D__X1"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
macppc )
|
||||
try_mpif90="mpxlf90 mpf90"
|
||||
|
|
@ -1514,7 +1515,6 @@ necsx )
|
|||
try_ar="sxar"
|
||||
try_arflags="rv"
|
||||
try_arflags_dynamic="rv"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
* )
|
||||
{ echo "$as_me:$LINENO: WARNING: unsupported architecture?" >&5
|
||||
|
|
@ -9463,11 +9463,9 @@ else
|
|||
fi
|
||||
echo setting FDFLAGS... $fdflags
|
||||
|
||||
if test "$cross_compiling" = "yes"
|
||||
if test "$ranlib" != "echo"
|
||||
then
|
||||
ranlib=echo
|
||||
else
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ arflags_dynamic=$ARFLAGS_DYNAMIC
|
|||
includefftw=$INCLUDEFFTW
|
||||
pgplot_libs=$PGPLOT_LIBS
|
||||
|
||||
|
||||
# command-line arguments
|
||||
for arg in $*
|
||||
do
|
||||
|
|
@ -60,10 +59,13 @@ AC_CANONICAL_BUILD
|
|||
# would fail because they can't run the compiled executables.
|
||||
# to work around that, let's pretend we are cross-compiling even if we aren't
|
||||
# !!! this relies on undocumented Autoconf behavior !!!
|
||||
if test "$host" = "" ; then host=$build ; fi
|
||||
|
||||
# this is our internal variable saying if we are REALLY cross-compiling
|
||||
cross_compiling=no
|
||||
# This is used to distinguish between true and fake cross compilation
|
||||
# (only on NEC SX6 actually)
|
||||
if test "$host" != "" ; then ranlib=echo; fi
|
||||
|
||||
cross_compiling=yes
|
||||
if test "$host" = "" ; then host=$build; fi
|
||||
|
||||
# identify architecture
|
||||
if test "$arch" = ""
|
||||
|
|
@ -128,7 +130,6 @@ sparc )
|
|||
crayx1 )
|
||||
try_f90="ftn $try_f90"
|
||||
try_dflags="-D__X1"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
macppc )
|
||||
try_mpif90="mpxlf90 mpf90"
|
||||
|
|
@ -149,7 +150,6 @@ necsx )
|
|||
try_ar="sxar"
|
||||
try_arflags="rv"
|
||||
try_arflags_dynamic="rv"
|
||||
cross_compiling=yes
|
||||
;;
|
||||
* )
|
||||
AC_MSG_WARN(unsupported architecture?)
|
||||
|
|
@ -1326,11 +1326,9 @@ else
|
|||
fi
|
||||
echo setting FDFLAGS... $fdflags
|
||||
|
||||
if test "$cross_compiling" = "yes"
|
||||
if test "$ranlib" != "echo"
|
||||
then
|
||||
ranlib=echo
|
||||
else
|
||||
AC_CHECK_PROG(ranlib,ranlib,ranlib,echo)
|
||||
AC_CHECK_PROG(ranlib,ranlib,ranlib,echo)
|
||||
fi
|
||||
echo setting RANLIB... $ranlib
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue