aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in5
-rw-r--r--configure.in4
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a981f5564..014526fb9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 26 22:20:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * configure.in: add support for as and ASFLAGS. [ruby-dev:29138]
+
Wed Jul 26 21:59:33 2006 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb (Net::HTTP#post, request_post, request): should
diff --git a/Makefile.in b/Makefile.in
index 8b56a410ec..cdc1f62443 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,6 +80,8 @@ NM = @NM@
AR = @AR@
ARFLAGS = rcu
RANLIB = @RANLIB@
+AS = @AS@
+ASFLAGS = @ASFLAGS@
OBJEXT = @OBJEXT@
MANTYPE = @MANTYPE@
@@ -161,6 +163,9 @@ lex.c: keywords
.c.@OBJEXT@:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c $<
+.s.@OBJEXT@:
+ $(AS) $(ASFLAGS) -o $@ $<
+
clean-local::
@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
diff --git a/configure.in b/configure.in
index c887ed7b15..02c33e2c81 100644
--- a/configure.in
+++ b/configure.in
@@ -165,6 +165,10 @@ if test -z "$AR"; then
AC_CHECK_PROGS(AR, aal, ar)
fi
+AC_CHECK_TOOL(AS, as)
+ASFLAGS=$ASFLAGS
+AC_SUBST(ASFLAGS)
+
case "$target_os" in
cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm)