aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-01-14 10:11:36 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-01-14 10:11:36 +0000
commitd63a6af935327945eaf687da6119fbabe03be3f9 (patch)
tree90e8986219703cb43e64597f8a07632517a0dee7 /configure
parent1fa404b60f7ccae99b9db3b187296b6b053805ea (diff)
parentce2eefd7c21697fee87a0686353de881081d22c6 (diff)
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Work around test-qht-par + gprof issues Travis CI jobs are failing because of test-qht-par when gprof is enabled. Temporarily disable test-qht-par if gprof is enabled, until we fix the bug. # gpg: Signature made Fri 11 Jan 2019 18:23:29 GMT # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: tests: Disable qht-bench parallel test when using gprof configure: Let the TARGET_GPROF var use the regular 'y' for Yes Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index e0915da750..4ea3f14883 100755
--- a/configure
+++ b/configure
@@ -7487,7 +7487,8 @@ alpha)
esac
if test "$gprof" = "yes" ; then
- echo "TARGET_GPROF=yes" >> $config_target_mak
+ echo "CONFIG_GPROF=y" >> $config_host_mak
+ echo "TARGET_GPROF=y" >> $config_target_mak
if test "$target_linux_user" = "yes" ; then
cflags="-p $cflags"
ldflags="-p $ldflags"