@@ -342,7 +342,6 @@ do
342342done
343343GAUGE_ARGS=$*
344344
345−echo "Using stack command [$STACK]"
346345BENCHMARKS=$(set_benchmarks)
347346if test "$LONG" -ne 0
348347then
@@ -371,22 +370,30 @@ BENCHMARKS_ORIG=$BENCHMARKS
371370BENCHMARKS=$(only_real_benchmarks)
372371echo "Using benchmark suites [$BENCHMARKS]"
373372
374−# XXX we can remove these if we pass stack build flags from command line like
375−# cabal build flags.
376−if echo "$BENCHMARKS" | grep -q base
377−then
378− STACK_BUILD_FLAGS="--flag streamly:dev"
379−fi
373+has_benchmark () {
374+ for i in $BENCHMARKS_ORIG
375+ do
376+ if test "$i" = "$1"
377+ then
378+ echo "$i"
379+ break
380+ fi
381+ done
382+}
380383
381−for i in $BENCHMARKS
384+for i in $DEV_BENCHMARKS
382385do
383− if test "$i" = concurrent
386+ if test $(has_benchmark $i) = "$i"
384387 then
385− STACK_BUILD_FLAGS="--flag streamly:dev"
386− break
388+ STACK_DEV_FLAG="--flag streamly:dev"
389+ CABAL_DEV_FLAG="--flag dev"
390+
387391 fi
388392done
389393
394+STACK_BUILD_FLAGS="$STACK_BUILD_FLAGS $STACK_DEV_FLAG"
395+CABAL_BUILD_FLAGS="$CABAL_BUILD_FLAGS $CABAL_DEV_FLAG"
396+
390397if test "$USE_STACK" = "1"
391398then
392399 WHICH_COMMAND="stack exec which"
@@ -430,17 +437,6 @@ fi
430437# Run reports
431438#-----------------------------------------------------------------------------
432439
433−has_benchmark () {
434− for i in $BENCHMARKS_ORIG
435− do
436− if test "$i" = "$1"
437− then
438− echo "$i"
439− break
440− fi
441− done
442−}
443−
444440VIRTUAL_REPORTS=""
445441if test "$(has_benchmark 'array-cmp')" = "array-cmp"
446442then