Procházet zdrojové kódy

Fix code coverage with lcrso's

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2729 fd59a12c-fef9-0310-b244-a6a79926bd2f
Angus Salkeld před 16 roky
rodič
revize
9a862803aa
3 změnil soubory, kde provedl 6 přidání a 4 odebrání
  1. 3 1
      configure.ac
  2. 1 1
      exec/Makefile.am
  3. 2 2
      services/Makefile.am

+ 3 - 1
configure.ac

@@ -390,10 +390,12 @@ if test "x${enable_coverage}" = xyes && \
 	OPT_CFLAGS="-O0"
 	COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs"
 	COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
+	COVERAGE_LCRSO_EXTRA_LDFLAGS="-rdynamic"
 	PACKAGE_FEATURES="$PACKAGE_FEATURES coverage"
 else
 	COVERAGE_CFLAGS=""
 	COVERAGE_LDFLAGS=""
+	COVERAGE_LCRSO_EXTRA_LDFLAGS=""
 fi
 
 
@@ -437,7 +439,7 @@ AC_SUBST([SOMICRO])
 AC_SUBST([SONAME])
 AC_SUBST([CPG_SONAME])
 AC_SUBST([CONFDB_SONAME])
-
+AC_SUBST([COVERAGE_LCRSO_EXTRA_LDFLAGS])
 AC_SUBST([OS_DYFLAGS])
 
 AC_SUBST([OS_LDL])

+ 1 - 1
exec/Makefile.am

@@ -122,7 +122,7 @@ libcoroipcs.so.$(SONAME): $(COROIPCS_OBJS)
 else
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) -shared -o $@ \

+ 2 - 2
services/Makefile.am

@@ -68,10 +68,10 @@ service_%.lcrso: %.o
 
 else
 quorum_%.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 endif
 
 endif