diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | configure.in | 4 |
4 files changed, 15 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore index 69a30e5f81..9fd96ca149 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,6 +6,8 @@ .ccmalloc .ppack .ext +.git +.svn .rbconfig.time COPYING.LIB ChangeLog.pre-alpha @@ -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 22:13:45 2006 Minero Aoki <aamine@loveruby.net> * lib/net/http.rb: sync with HEAD (rev 1.132). diff --git a/Makefile.in b/Makefile.in index 8104217687..2b050bf095 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,6 +79,8 @@ NM = @NM@ AR = @AR@ ARFLAGS = rcu RANLIB = @RANLIB@ +AS = @AS@ +ASFLAGS = @ASFLAGS@ OBJEXT = @OBJEXT@ MANTYPE = @MANTYPE@ @@ -162,6 +164,9 @@ lex.c: keywords .c.@OBJEXT@: $(CC) $(CFLAGS) $(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 433bde0368..00cbaf7b70 100644 --- a/configure.in +++ b/configure.in @@ -169,6 +169,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) |