Switch to using GPRBUILD_CARGS Makefile variable

Author: eliericha

Makefile

@@ -105,7 +105,7 @@ endif
 
 all: coverage-instrument
 ifeq ($(ALIRE),True)
-	alr build -- -XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) $(GPRBUILD_FLAGS)
+	alr build -- -XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) $(GPRBUILD_FLAGS) $(GPRBUILD_CARGS)
 else
 	# We have our own s-memory.adb which overwrites the default System.Memory implementation
         # For unclear reasons, this file is not recompiled when the version of GNAT was changed

scripts/build_als.sh

@@ -288,14 +288,14 @@ function build_als() {
          #
          # To avoid that, we use the -gnateb flag which tells GNAT to not use
          # an absolute path for gnat.adc
-         gprbuild_flag="-cargs:ada -gnateb"
+         gprbuild_flag="-vm -cargs:ada -gnateb -bargs -v"
          ;;
       esac
    fi
 
    # We use 'alr exec' to benefit from Alire setting up GPR_PROJECT_PATH with
    # all the dependencies.
-   LIBRARY_TYPE=static STANDALONE=no GPRBUILD_EXTRA="$gprbuild_flag" alr exec make -- "VERSION=$TAG" all
+   LIBRARY_TYPE=static STANDALONE=no GPRBUILD_CARGS="$gprbuild_flag" alr exec make -- "VERSION=$TAG" all
 }
 
 function test_als() {