diff options
| author | unknown <acurtis@xiphis.org> | 2006-06-28 09:54:40 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-06-28 09:54:40 -0700 |
| commit | 76d0badd895c7a1a56ccf68b16bf944f93bd9870 (patch) | |
| tree | ce9c2a45a95b57ab64b04f05a47f6c0b411a1d5d /strings | |
| parent | 2f45384bf1eb48b9fab73bf413ceb2dc557f29b7 (diff) | |
| parent | edcba74415fc7a2ead3d65628d22efab598a61b8 (diff) | |
| download | mariadb-git-76d0badd895c7a1a56ccf68b16bf944f93bd9870.tar.gz | |
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into xiphis.org:/home/antony/work2/p4-bug12096.2-merge
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index c43cf0f290a..7ee115c09e5 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -66,12 +66,6 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ #strtoull.o: @CHARSET_OBJS@ -if ASSEMBLER -# On Linux gcc can compile the assembly files -%.o : %.s - $(AS) $(ASFLAGS) -o $@ $< -endif - FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ str_test: str_test.c $(pkglib_LIBRARIES) |