diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2021-03-24 23:02:07 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2021-03-24 23:02:07 (GMT) |
| commit | bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23 (patch) | |
| tree | cdd7760978d1c76b264957e8856c982ab992d792 /config | |
| parent | 2e3b24078e63ae944fc1d1e7ef10a70dfd2ebac6 (diff) | |
| download | hdf5-bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23.zip hdf5-bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23.tar.gz hdf5-bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23.tar.bz2 | |
Brings some Autotools improvements over from develop
* configure.ac tidying
* helpful XCode comments
* FreeBSD improvements
* Fixes for finding Java on MacOS
* The improved warnhist script
Diffstat (limited to 'config')
| -rw-r--r-- | config/clang-flags | 5 | ||||
| -rw-r--r-- | config/freebsd | 28 |
2 files changed, 28 insertions, 5 deletions
diff --git a/config/clang-flags b/config/clang-flags index b4f5e2e..a349f58 100644 --- a/config/clang-flags +++ b/config/clang-flags @@ -56,7 +56,10 @@ load_clang_arguments() # if test "X-" = "X-$cc_flags_set"; then # clang -v will return version number following "clang" on Linux machines, - # but on Macs the version number will follow "Apple LLVM version" + # but on Xcode the version number will follow "Apple LLVM version" + # Note that the Xcode reported LLVM version doesn't match the canonical + # LLVM version, so you'll need to do different version checks for + # Xcode. cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |\ grep 'clang version' | sed 's/.*clang version \([-a-z0-9\.]*\).*/\1/'`" if test -n "$cc_version"; then diff --git a/config/freebsd b/config/freebsd index 9a9348b..ba05380 100644 --- a/config/freebsd +++ b/config/freebsd @@ -18,19 +18,26 @@ # # See BlankForm in this directory for details. -# The default compiler is `gcc' +# The default compiler is 'cc' if test "X-" = "X-$CC"; then - CC=gcc - CC_BASENAME=gcc + CC=cc + CC_BASENAME=cc fi -# Figure out C compiler flags +# Figure out clang C compiler flags +. $srcdir/config/clang-flags + +# Figure out GNU C compiler flags . $srcdir/config/gnu-flags # Figure out Intel C compiler flags . $srcdir/config/intel-flags # The default Fortran 90 compiler +# No default Fortran compiler for clang. flang exists on +# FreeBSD as a port, but this is tied to an ancient LLVM +# and lacks Fortran 2003 features which causes configure +# to fail. if test "X-" = "X-$FC"; then case $CC_BASENAME in gcc*|pgcc*) @@ -54,3 +61,16 @@ fi # Figure out Intel F90 compiler flags . $srcdir/config/intel-fflags +# The default C++ compiler + +# The default compiler is 'c++'. +if test -z "$CXX"; then + CXX=c++ + CXX_BASENAME=c++ +fi + +# Figure out Clang CXX compiler flags +. $srcdir/config/clang-cxxflags + +# Figure out GNU CXX compiler flags +. $srcdir/config/gnu-cxxflags |