From aa3f72e86410eae326c7af78e9f8564f5fdf0cd6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20DAVID?= Date: Wed, 23 Jan 2013 15:19:12 +0100 Subject: [PATCH] Compilation: fix --enable-code-coverage C/CXX/F/LDFLAGS Change-Id: I26a2538c12d8ed6e250341cb253432d0d77fc898 --- scilab/configure | 8 ++++---- scilab/configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scilab/configure b/scilab/configure index 02b8b5d..5b63682 100755 --- a/scilab/configure +++ b/scilab/configure @@ -9199,7 +9199,7 @@ if test -n "$F77"; then gfortran*) ## With GNU Compiler enable the code coverage if test "$enable_code_coverage" = yes; then - CODE_COVERAGE_FFLAGS="-fprofile-arcs -ftest-coverage" + CODECOVERAGE_FFLAGS="-fprofile-arcs -ftest-coverage" fi ;; g77*) @@ -9374,7 +9374,7 @@ case "$CXX" in # enable the code coverage if test "$enable_code_coverage" = yes; then - CODE_COVERAGE_CXXFLAGS="-fprofile-arcs -ftest-coverage" + CODECOVERAGE_CXXFLAGS="-fprofile-arcs -ftest-coverage" fi if test "$enable_debug_CXX" = yes; then @@ -9415,7 +9415,7 @@ case "$CC" in # enable the code coverage if test "$enable_code_coverage" = yes; then - CODE_COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" + CODECOVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" fi if test "$enable_debug_C" = yes; then @@ -9630,7 +9630,7 @@ fi if test -z "$GENHTML" ; then as_fn_error $? "Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage" "$LINENO" 5 fi - CODE_COVERAGE_LDFLAGS="-coverage" + CODECOVERAGE_LDFLAGS="-coverage -lgcov" fi if test "$enable_code_coverage" = yes; then CODE_COVERAGE_TRUE= diff --git a/scilab/configure.ac b/scilab/configure.ac index 018e47a..4de8508 100644 --- a/scilab/configure.ac +++ b/scilab/configure.ac @@ -399,7 +399,7 @@ if test -n "$F77"; then gfortran*) ## With GNU Compiler enable the code coverage if test "$enable_code_coverage" = yes; then - CODE_COVERAGE_FFLAGS="-fprofile-arcs -ftest-coverage" + CODECOVERAGE_FFLAGS="-fprofile-arcs -ftest-coverage" fi ;; g77*) @@ -519,7 +519,7 @@ case "$CXX" in # enable the code coverage if test "$enable_code_coverage" = yes; then - CODE_COVERAGE_CXXFLAGS="-fprofile-arcs -ftest-coverage" + CODECOVERAGE_CXXFLAGS="-fprofile-arcs -ftest-coverage" fi if test "$enable_debug_CXX" = yes; then @@ -560,7 +560,7 @@ case "$CC" in # enable the code coverage if test "$enable_code_coverage" = yes; then - CODE_COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" + CODECOVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" fi if test "$enable_debug_C" = yes; then @@ -696,7 +696,7 @@ if test "$enable_code_coverage" = yes; then if test -z "$GENHTML" ; then AC_MSG_ERROR([Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage]) fi - CODE_COVERAGE_LDFLAGS="-coverage" + CODECOVERAGE_LDFLAGS="-coverage -lgcov" fi AM_CONDITIONAL(CODE_COVERAGE, test "$enable_code_coverage" = yes) -- 1.7.9.5