diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-06-21 22:20:04 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-06-21 22:42:59 (GMT) |
| commit | e64ed323db7c98a246d3386a146f87003886040a (patch) | |
| tree | 370d5edd9c2bd8310d1a04866bafdb26eb87700f /config/apple | |
| parent | 8e62f1fe7b38b630f1a41007a03341cb66dec4b3 (diff) | |
| download | hdf5-e64ed323db7c98a246d3386a146f87003886040a.zip hdf5-e64ed323db7c98a246d3386a146f87003886040a.tar.gz hdf5-e64ed323db7c98a246d3386a146f87003886040a.tar.bz2 | |
Merge pull request #2656 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:changes_1_12_merge to hdf5_1_12
* commit '538b1317646f52658c2a896bbde4dce4246a9761':
Squashed commit of the following:
Addition of clang-warnings flags
Update examples/teth5cc.sh.in for version 1.10.
Diffstat (limited to 'config/apple')
| -rw-r--r-- | config/apple | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/apple b/config/apple index 0b15dfe..aba48d1 100644 --- a/config/apple +++ b/config/apple @@ -49,6 +49,7 @@ fi # Figure out compiler flags . $srcdir/config/gnu-flags +. $srcdir/config/clang-flags # temp patch: if GCC 4.2.1 is used in Lion or Mountain Lion systems, do not # use -O option as it causes failures in test/dt_arith. case "$host_os" in @@ -155,11 +156,13 @@ esac # get c++ version info case $CXX in clang++) + . $srcdir/config/clang-cxxflags cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\ grep 'Apple' | sed 's/(.*//'` ;; *g++*) + . $srcdir/config/gnu-cxxflags cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\ grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'` ;; |