summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-11-15 22:46:53 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-11-15 22:46:53 (GMT)
commitdc487ebad857d127a97a29d1cc7c55a6a38f30d1 (patch)
tree0e85105617af95ca8e5d8532faf19e2272bf3197
parentbdb4d5653226c030dfb33a6962544c93bf64ed21 (diff)
parentcb235453a9276c371085e40ea1c87d9b641e511e (diff)
downloadhdf5-dc487ebad857d127a97a29d1cc7c55a6a38f30d1.zip
hdf5-dc487ebad857d127a97a29d1cc7c55a6a38f30d1.tar.gz
hdf5-dc487ebad857d127a97a29d1cc7c55a6a38f30d1.tar.bz2
Merge pull request #782 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:ar_fix to develop
* commit 'cb235453a9276c371085e40ea1c87d9b641e511e': Changed ar to always use -cr instead of the autotools default of cru.
-rw-r--r--config/linux-gnulibc15
-rw-r--r--configure.ac7
2 files changed, 6 insertions, 6 deletions
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index c32f64e..39225e7 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -30,11 +30,6 @@ if test -z "$CC"; then
fi
fi
-# Set flags for gnu ar (apparently via libtool, so AR_FLAGS, not ARFLAGS)
-# If you don't do this, you will get warnings about the 'u' in
-# automake's default 'cru' args.
-AR_FLAGS=crD
-
# Figure out GNU C compiler flags
. $srcdir/config/gnu-flags
diff --git a/configure.ac b/configure.ac
index 50893f7..5562d5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,12 +759,17 @@ fi
## Check which archiving tool to use. This needs to be done before
## the AM_PROG_LIBTOOL macro.
##
-
if test -z "$AR"; then
AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
fi
AC_SUBST([AR])
+# Set the default ar flags to cr
+# The Automake default is to use cru and the 'u' causes ar
+# to emit warnings on some platforms.
+AR_FLAGS=cr
+
+
## Export the AR macro so that it will be placed in the libtool file
## correctly.
export AR