From 47b3b199cfc60c5d603d950e5c6360d0d61fb17f Mon Sep 17 00:00:00 2001 From: Paul Cadman Date: Wed, 15 May 2024 11:54:50 +0100 Subject: [PATCH] justfile: replace enableOptimized flag with disableOptimized (#2783) `just install` now builds the optimized binary by default. use `just disableOptimized=yes install` to build the non-optimized binary (with faster build time). --- .github/workflows/ci.yml | 2 +- justfile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d31dd6246..4ccc0a1d72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ env: VAMPIRREPO: anoma/vamp-ir VAMPIRVERSION: v0.1.3 CAIRO_VM_VERSION: 6bb5330aede3fc8049b498012a6efbf12bc9432a - JUST_ARGS: enableOptimized=yes runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL + JUST_ARGS: runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j jobs: diff --git a/justfile b/justfile index 8208445a29..ea621942cc 100644 --- a/justfile +++ b/justfile @@ -4,11 +4,11 @@ # just disableParallel=yes test disableParallel := '' -# set to non-empty string to enable optimzed build +# set to non-empty string to disable optimized build # # e.g: -# just enableOptimized=yes install -enableOptimized := '' +# just disableOptimized=yes install +disableOptimized := '' # set to non-empty string to enable command debugging enableDebug := '' @@ -34,7 +34,7 @@ runtimeLibtoolFlag := if runtimeLibtoolArg == '' { '' } else { "LIBTOOL=" + runt runtimeArgs := trim(runtimeCcFlag + ' ' + runtimeLibtoolFlag) # flags used in the stack command -stackOptFlag := if enableOptimized == '' { '--fast' } else { '' } +stackOptFlag := if disableOptimized == '' { '' } else { '--fast' } # The ghc `-j` flag defaults to number of cpus when no argument is passed stackGhcParallelFlag := if disableParallel == '' { "--ghc-options=-j" + numParallelJobs } else { '' } # The stack `-j` options requires an argument