summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-10 03:03:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-10 03:03:57 +0000
commit12eb0df4d55e4ce1cd0cfafab72706accf9fa5ba (patch)
tree3e96ce33dbc1ed10cfaff1b07ef4ddb7cf6c5200
parent7935edc6aeacbf7cec5b43e16e8c08be754a2387 (diff)
check ar D flag
* configure.in (ARFLAGS): check if deterministic mode flag is effective, which is on by default on Ubuntu. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
-rw-r--r--configure.in6
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e0ccd66a3..5749af7e08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 10 12:03:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (ARFLAGS): check if deterministic mode flag is
+ effective, which is on by default on Ubuntu.
+
Tue Feb 9 16:36:23 2016 Naotoshi Seo <sonots@gmail.com>
* lib/logger.rb: Remove block from Logger.add as it's not needed
diff --git a/Makefile.in b/Makefile.in
index 17164cb25b..4f5c58baad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,7 +165,7 @@ RMDIRS = @RMDIRS@
RMALL = @RMALL@
NM = @NM@
AR = @AR@
-ARFLAGS = rcu
+ARFLAGS = @ARFLAGS@
RANLIB = @RANLIB@
AS = @AS@
ASFLAGS = @ASFLAGS@ $(INCFLAGS)
diff --git a/configure.in b/configure.in
index 040484b5ab..dba9d4a097 100644
--- a/configure.in
+++ b/configure.in
@@ -567,6 +567,12 @@ AC_CHECK_TOOL(AR, ar)
if test -z "$AR"; then
AC_CHECK_PROGS(AR, aal, ar)
fi
+AC_CACHE_CHECK([for $AR D option], [rb_cv_ar_D_option], [
+ AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
+ [rb_cv_ar_D_option=yes], [rb_cv_ar_D_option=no])
+])
+AS_IF([test "$rb_cv_ar_D_option" = yes], [ARFLAGS=rcD], [ARFLAGS=rcu])
+AC_SUBST(ARFLAGS)
AC_CHECK_TOOL(AS, as)
ASFLAGS=$ASFLAGS