summaryrefslogtreecommitdiffstats
path: root/libelf
diff options
context:
space:
mode:
authorUlrich Drepper <[email protected]>2005-08-28 17:59:03 +0000
committerUlrich Drepper <[email protected]>2005-08-28 17:59:03 +0000
commitc2c3b1ecbe235c4e04ddcbafe6f0f27dccd86d9b (patch)
treedd3dc6692fb6098bc4d7e84c2609ab06873bf528 /libelf
parent3d413d4b05005bbd4c384b60e3797caf57f120d5 (diff)
Since we link statically when using gcov don't compile the .os files
with the options.
Diffstat (limited to 'libelf')
-rw-r--r--libelf/ChangeLog2
-rw-r--r--libelf/Makefile.am5
2 files changed, 6 insertions, 1 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 17b7136e..4146968e 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,6 +1,8 @@
2005-08-28 Ulrich Drepper <[email protected]>
* Makefile.am: Use $(LINK) not $(CC) when creating DSO.
+ (%.os): Use COMPILE.os.
+ (COMPILE.os): Filter out gconv options.
2005-08-27 Ulrich Drepper <[email protected]>
diff --git a/libelf/Makefile.am b/libelf/Makefile.am
index 17851fc5..37683d85 100644
--- a/libelf/Makefile.am
+++ b/libelf/Makefile.am
@@ -31,6 +31,9 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
VERSION = 1
PACKAGE_VERSION = @PACKAGE_VERSION@
+COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
+ $(COMPILE)))
+
lib_LIBRARIES = libelf.a
if !MUDFLAP
noinst_LIBRARIES = libelf_pic.a
@@ -99,7 +102,7 @@ libelf.so: libelf_pic.a libelf.map
ln -fs $@ $@.$(VERSION)
%.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"; \