diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-08-28 17:59:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-08-28 17:59:03 +0000 |
| commit | c2c3b1ecbe235c4e04ddcbafe6f0f27dccd86d9b (patch) | |
| tree | dd3dc6692fb6098bc4d7e84c2609ab06873bf528 /libasm | |
| parent | 3d413d4b05005bbd4c384b60e3797caf57f120d5 (diff) | |
Since we link statically when using gcov don't compile the .os files
with the options.
Diffstat (limited to 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 2 | ||||
| -rw-r--r-- | libasm/Makefile.am | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index c9a26b9a..d4c06348 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,6 +1,8 @@ 2005-08-28 Ulrich Drepper <drepper@redhat.com> * Makefile.am: Use $(LINK) not $(CC) when creating DSO. + (%.os): Use COMPILE.os. + (COMPILE.os): Filter out gconv options. 2005-08-02 Ulrich Drepper <drepper@redhat.com> diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 172143c3..e9b99397 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -24,6 +24,9 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 +COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ + $(COMPILE))) + lib_LIBRARIES = libasm.a if !MUDFLAP noinst_LIBRARIES = libasm_pic.a @@ -60,7 +63,7 @@ libasm.so: libasm_pic.a libasm.map %.os: %.c %.o - if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ + if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ rm -f "$(DEPDIR)/$*.Tpo"; \ |