diff --git a/packages/conf-llvm/conf-llvm.10.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.10.0.0/files/configure.sh
index d88f6ed0ea0f..dee52c33bb53 100644
--- a/packages/conf-llvm/conf-llvm.10.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.10.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config-${version}.0 llvm-config${ve
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.10.0.0/opam b/packages/conf-llvm/conf-llvm.10.0.0/opam
index 3be32a15720c..53158eaa42e9 100644
--- a/packages/conf-llvm/conf-llvm.10.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.10.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm10"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=c684ff1f4e2fee80154115d172ca49d6"]
+extra-files: ["configure.sh" "md5=bc710689f7c84f6f68e91b2f68b385b1"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.11.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.11.0.0/files/configure.sh
index 446117bc62f5..c93d36731aa4 100644
--- a/packages/conf-llvm/conf-llvm.11.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.11.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config-${version}.0 llvm-config${ve
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v ${llvm_config})\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.11.0.0/opam b/packages/conf-llvm/conf-llvm.11.0.0/opam
index 31af3105bf74..0d449f78a57a 100644
--- a/packages/conf-llvm/conf-llvm.11.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.11.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm11"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=2750506041c4edef4482ce9fb5f30aa1"]
+extra-files: ["configure.sh" "md5=22d6fdea8134c33fcf135d8ca35d060a"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.3.4/files/configure b/packages/conf-llvm/conf-llvm.3.4/files/configure
index 5b1361e1307e..1513f5d893f0 100644
--- a/packages/conf-llvm/conf-llvm.3.4/files/configure
+++ b/packages/conf-llvm/conf-llvm.3.4/files/configure
@@ -13,7 +13,7 @@ for llvm_config in $config llvm-config-$version llvm-config${version//./} llvm-c
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.3.4/opam b/packages/conf-llvm/conf-llvm.3.4/opam
index 7a4184e828f4..4e970939f570 100644
--- a/packages/conf-llvm/conf-llvm.3.4/opam
+++ b/packages/conf-llvm/conf-llvm.3.4/opam
@@ -16,5 +16,5 @@ post-messages:
   "If you use homebrew, please build and install llvm-3.4 manually, since brew formula is not available for this version"
     {failure & (os = "macos" | os = "macos")}
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure" "md5=67afff0753bd62bc5adbe9e205c91138"]
+extra-files: ["configure" "md5=567276d6cfb8e395de84013c2fd436f2"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.3.8/files/configure.sh b/packages/conf-llvm/conf-llvm.3.8/files/configure.sh
index 06227ac7c932..dffda52f9031 100644
--- a/packages/conf-llvm/conf-llvm.3.8/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.3.8/files/configure.sh
@@ -13,7 +13,7 @@ for llvm_config in $config llvm-config-$version llvm-config${version//./} llvm-c
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.3.8/opam b/packages/conf-llvm/conf-llvm.3.8/opam
index c730d01ebb2f..0e69b53bde2c 100644
--- a/packages/conf-llvm/conf-llvm.3.8/opam
+++ b/packages/conf-llvm/conf-llvm.3.8/opam
@@ -14,5 +14,5 @@ depexts: [
   ["devel/llvm38"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=57f3b2473628ad9da28e94fb8b4746f9"]
+extra-files: ["configure.sh" "md5=9294c1d6f95da6b9cafb42edfa660142"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.3.9/files/configure.sh b/packages/conf-llvm/conf-llvm.3.9/files/configure.sh
index 06227ac7c932..dffda52f9031 100644
--- a/packages/conf-llvm/conf-llvm.3.9/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.3.9/files/configure.sh
@@ -13,7 +13,7 @@ for llvm_config in $config llvm-config-$version llvm-config${version//./} llvm-c
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.3.9/opam b/packages/conf-llvm/conf-llvm.3.9/opam
index 7d94bad0044f..bf7af2589757 100644
--- a/packages/conf-llvm/conf-llvm.3.9/opam
+++ b/packages/conf-llvm/conf-llvm.3.9/opam
@@ -16,5 +16,5 @@ depexts: [
   ["devel/llvm39"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=57f3b2473628ad9da28e94fb8b4746f9"]
+extra-files: ["configure.sh" "md5=9294c1d6f95da6b9cafb42edfa660142"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.4.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.4.0.0/files/configure.sh
index a527d895cb80..c1f3d688431f 100644
--- a/packages/conf-llvm/conf-llvm.4.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.4.0.0/files/configure.sh
@@ -13,7 +13,7 @@ for llvm_config in $config llvm-config-$version llvm-config${version//./} llvm-c
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.4.0.0/opam b/packages/conf-llvm/conf-llvm.4.0.0/opam
index 0dd1c2aae042..3b79fc99c5a5 100644
--- a/packages/conf-llvm/conf-llvm.4.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.4.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm40"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=8e501d281808e64c85d14cc521436d6c"]
+extra-files: ["configure.sh" "md5=f01bafcd226b25403419450d36984c38"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.5.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.5.0.0/files/configure.sh
index bd0d7c67d4f5..70f87f3be367 100644
--- a/packages/conf-llvm/conf-llvm.5.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.5.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config${version//./} llvm-config-mp
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.5.0.0/opam b/packages/conf-llvm/conf-llvm.5.0.0/opam
index ebd9b9d279cc..344a94cc5dc5 100644
--- a/packages/conf-llvm/conf-llvm.5.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.5.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm50"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=76668caf3382b83f398fb3549306f431"]
+extra-files: ["configure.sh" "md5=f18e085508b5600051e99085753796f3"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.6.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.6.0.0/files/configure.sh
index bd0d7c67d4f5..70f87f3be367 100644
--- a/packages/conf-llvm/conf-llvm.6.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.6.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config${version//./} llvm-config-mp
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.6.0.0/opam b/packages/conf-llvm/conf-llvm.6.0.0/opam
index 173ef84a292d..c004ecf4d7d0 100644
--- a/packages/conf-llvm/conf-llvm.6.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.6.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm60"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=76668caf3382b83f398fb3549306f431"]
+extra-files: ["configure.sh" "md5=f18e085508b5600051e99085753796f3"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.7.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.7.0.0/files/configure.sh
index d88f6ed0ea0f..dee52c33bb53 100644
--- a/packages/conf-llvm/conf-llvm.7.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.7.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config-${version}.0 llvm-config${ve
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.7.0.0/opam b/packages/conf-llvm/conf-llvm.7.0.0/opam
index 6e53a610a9ef..6ace135f689c 100644
--- a/packages/conf-llvm/conf-llvm.7.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.7.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm70"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=c684ff1f4e2fee80154115d172ca49d6"]
+extra-files: ["configure.sh" "md5=bc710689f7c84f6f68e91b2f68b385b1"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.8.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.8.0.0/files/configure.sh
index d88f6ed0ea0f..dee52c33bb53 100644
--- a/packages/conf-llvm/conf-llvm.8.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.8.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config-${version}.0 llvm-config${ve
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.8.0.0/opam b/packages/conf-llvm/conf-llvm.8.0.0/opam
index c12f45eb937a..f5db3236f2f6 100644
--- a/packages/conf-llvm/conf-llvm.8.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.8.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm80"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=c684ff1f4e2fee80154115d172ca49d6"]
+extra-files: ["configure.sh" "md5=bc710689f7c84f6f68e91b2f68b385b1"]
 flags: conf
diff --git a/packages/conf-llvm/conf-llvm.9.0.0/files/configure.sh b/packages/conf-llvm/conf-llvm.9.0.0/files/configure.sh
index d88f6ed0ea0f..dee52c33bb53 100644
--- a/packages/conf-llvm/conf-llvm.9.0.0/files/configure.sh
+++ b/packages/conf-llvm/conf-llvm.9.0.0/files/configure.sh
@@ -11,7 +11,7 @@ for llvm_config in llvm-config-$version llvm-config-${version}.0 llvm-config${ve
     llvm_version="`$llvm_config --version`" || true
     case $llvm_version in
     $version*)
-        echo "config: \"$llvm_config\"" >> conf-llvm.config
+        echo "config: \"$(command -v '$llvm_config')\"" >> conf-llvm.config
         echo "version: \"$llvm_version\"" >> conf-llvm.config
         exit 0;;
     *)
diff --git a/packages/conf-llvm/conf-llvm.9.0.0/opam b/packages/conf-llvm/conf-llvm.9.0.0/opam
index 42b7147dbed0..95eeef7c30d1 100644
--- a/packages/conf-llvm/conf-llvm.9.0.0/opam
+++ b/packages/conf-llvm/conf-llvm.9.0.0/opam
@@ -18,5 +18,5 @@ depexts: [
   ["devel/llvm90"] {os = "freebsd"}
 ]
 synopsis: "Virtual package relying on llvm library installation"
-extra-files: ["configure.sh" "md5=c684ff1f4e2fee80154115d172ca49d6"]
+extra-files: ["configure.sh" "md5=bc710689f7c84f6f68e91b2f68b385b1"]
 flags: conf