summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2016-11-26 17:15:35 +0100
committerBruno Haible <bruno@clisp.org>2016-11-26 17:15:35 +0100
commit31784d388fe19f3de97ea65cfe03b0770db6170f (patch)
tree15d19de65b45175e536fadf7d936ec0186a86d73
parentb468e3aae05d176dbb4b5cdc5820b80b1ed420b9 (diff)
downloadgperf-31784d388fe19f3de97ea65cfe03b0770db6170f.tar.gz
Use proper 'ar' program when cross-compiling or when AR is specified.
-rw-r--r--ChangeLog8
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/configure.ac4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e5a9c0..9eb3de2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2016-11-26 Bruno Haible <bruno@clisp.org>
+ Use proper 'ar' program when cross-compiling or when AR is specified.
+ * lib/configure.ac (AR): Determine through AC_CHECK_TOOL.
+ * lib/Makefile.in (AR): Use value determined by 'configure'.
+ Reported by György Andrasek <jurily@gmail.com>
+ at <http://lists.gnu.org/archive/html/bug-gperf/2014-04/msg00000.html>.
+
+2016-11-26 Bruno Haible <bruno@clisp.org>
+
Avoid 'warning: cast from pointer to integer of different size'
in output code on 64-bit native Windows platforms.
* src/output.cc (output_keyword_entry): Cast pointer to 'size_t',
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6a46d59..497736e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -41,7 +41,7 @@ CXXCPP = @CXXCPP@
# Both C and C++ compiler
OBJEXT = @OBJEXT@
# Other
-AR = ar
+AR = @AR@
AR_FLAGS = rc
RANLIB = @RANLIB@
MV = mv
diff --git a/lib/configure.ac b/lib/configure.ac
index b3df1cd..be003b1 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -1,6 +1,6 @@
dnl autoconf configuration for gperf/lib
-dnl Copyright (C) 1998, 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 2002, 2005, 2007, 2009, 2016 Free Software Foundation, Inc.
dnl Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
dnl and Bruno Haible <bruno@clisp.org>.
dnl
@@ -33,6 +33,8 @@ AC_PROG_CXX
dnl sets variable CXX
AC_PROG_CXXCPP
dnl sets variable CXXCPP
+AC_CHECK_TOOL([AR], [ar])
+ dnl sets variable AR
AC_PROG_RANLIB
dnl sets variable RANLIB
CL_PROG_INSTALL