aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2020-10-09 13:59:27 +0100
committerJonathan Wakely <jwakely@redhat.com>2020-10-09 14:01:55 +0100
commit7e7eef2a1bb45c61ee26936ccaab7159dcceca94 (patch)
tree246b034851951fdd46e91da22fa140dd718b617d
parentf9919ba717dfaf6018b7e625bebc84a461477b52 (diff)
downloadgcc-7e7eef2a1bb45c61ee26936ccaab7159dcceca94.zip
gcc-7e7eef2a1bb45c61ee26936ccaab7159dcceca94.tar.gz
gcc-7e7eef2a1bb45c61ee26936ccaab7159dcceca94.tar.bz2
libstdc++: Pass CXXFLAGS to check_performance script
It looks like our check-performance target runs completely unoptimized, which is a bit silly. This exports the CXXFLAGS from the parent make process to the check_performance script. libstdc++-v3/ChangeLog: * scripts/check_performance: Use gnu++11 instead of gnu++0x. * testsuite/Makefile.am (check-performance): Export CXXFLAGS to child process. * testsuite/Makefile.in: Regenerate.
-rwxr-xr-xlibstdc++-v3/scripts/check_performance2
-rw-r--r--libstdc++-v3/testsuite/Makefile.am1
-rw-r--r--libstdc++-v3/testsuite/Makefile.in1
3 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/scripts/check_performance b/libstdc++-v3/scripts/check_performance
index 3fa9274..cde3874 100755
--- a/libstdc++-v3/scripts/check_performance
+++ b/libstdc++-v3/scripts/check_performance
@@ -32,7 +32,7 @@ SH_FLAG="-Wl,--rpath -Wl,$BUILD_DIR/../../gcc \
-Wl,--rpath -Wl,$BUILD_DIR/src/.libs"
ST_FLAG="-static"
LINK=$SH_FLAG
-CXX="$COMPILER $INCLUDES $FLAGS -std=gnu++0x $CXXFLAGS $LINK"
+CXX="$COMPILER $INCLUDES $FLAGS -std=gnu++11 $CXXFLAGS $LINK"
LIBS="./libtestc++.a"
TESTS_FILE="testsuite_files_performance"
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 9cef1e6..2fca179 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -182,6 +182,7 @@ check-compile: testsuite_files ${compile_script}
check_performance_script=${glibcxx_srcdir}/scripts/check_performance
check-performance: testsuite_files_performance ${performance_script}
-@(chmod + ${check_performance_script}; \
+ export CXXFLAGS="$(CXXFLAGS)"; \
${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
# Runs the testsuite in debug mode.
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 7be29e5..4e829d0 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -703,6 +703,7 @@ check-compile: testsuite_files ${compile_script}
${compile_script} ${glibcxx_srcdir} ${glibcxx_builddir})
check-performance: testsuite_files_performance ${performance_script}
-@(chmod + ${check_performance_script}; \
+ export CXXFLAGS="$(CXXFLAGS)"; \
${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
check-debug: site.exp