From 2139206eaf7f55c7dee0a62bfc63c606ea34b598 Mon Sep 17 00:00:00 2001 From: Francis Russell Date: Fri, 25 Jan 2013 16:34:50 +0000 Subject: [PATCH] Add build system fixes due to new Debian/Ubuntu linking. --- benchmark.mk.in | 2 +- common/generate_ufl_rules.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/benchmark.mk.in b/benchmark.mk.in index 11e1128..113b3cf 100644 --- a/benchmark.mk.in +++ b/benchmark.mk.in @@ -12,7 +12,7 @@ CXXFLAGS=@CXXFLAGS@ LDFLAGS=@LDFLAGS@ CXXFLAGS+= @BOOST_CPPFLAGS@ -I../ufc -O3 -LDFLAGS+= @BOOST_LDFLAGS@ @BOOST_SERIALIZATION_LIB@ @APR1_LIBS@ -lm -lpapi +LDLIBS+= @BOOST_LDFLAGS@ @BOOST_SERIALIZATION_LIB@ @APR1_LIBS@ -lm -lpapi all-benchmarks: ${ALL_EXECUTABLES} diff --git a/common/generate_ufl_rules.sh b/common/generate_ufl_rules.sh index 42dedcd..5a3ef5e 100755 --- a/common/generate_ufl_rules.sh +++ b/common/generate_ufl_rules.sh @@ -56,7 +56,6 @@ for NF in 1 2 3 4; do ${ECHO} "${BENCHMARK_SOURCE}: ${BENCHMARK_TEMPLATE}" ${ECHO} -e "\tm4 -DMAT_TYPE=${MAT_TYPE} -DNF_VALUE=${NF} -DP_VALUE=${P} -DQ_VALUE=${Q} -DFIELD_RANK=${FIELD_RANK} \$^ > \$@" ${ECHO} "${BENCHMARK_EXECUTABLE}: ${BENCHMARK_SOURCE} ${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES}" - ${ECHO} -e '\t${CXX} ${CXXFLAGS} ${LDFLAGS} $< -o $@' CLEAN_FILES="${BENCHMARK_EXECUTABLE} ${TEMPLATE_GENERATED} ${CLEAN_FILES}" CLEAN_FILES="${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES} ${CLEAN_FILES}" -- 2.47.3