diff options
| author | acurtis@ltamd64.xiphis.org <> | 2006-06-28 10:02:47 -0700 |
|---|---|---|
| committer | acurtis@ltamd64.xiphis.org <> | 2006-06-28 10:02:47 -0700 |
| commit | 9d99e180f50992551eee033f631d99fc56f08cba (patch) | |
| tree | abdc4e16f679d7e8beef8481d94750975fd39f61 /strings | |
| parent | 3e22ea44e55d5295829f7383b31914c2fcb5894c (diff) | |
| parent | 04f245113382733915f07c8ff8fc03b157778442 (diff) | |
| download | mariadb-git-9d99e180f50992551eee033f631d99fc56f08cba.tar.gz | |
Merge xiphis.org:/home/antony/work2/p4-bug12096.3
into xiphis.org:/home/antony/work2/p4-bug12096.3-merge
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 1cba4bab3f0..416442dd564 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -67,12 +67,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) |