diff --git a/meson_options.txt b/meson_options.txt
index 5baa70d051bc8..9afe105241f35 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -357,7 +357,7 @@ option(
 option(
   'draw-use-llvm',
   type : 'boolean',
-  value : 'true',
+  value : true,
   description : 'Whether to use LLVM for the Gallium draw module, if LLVM is included.'
 )
 option(
diff --git a/src/amd/drm-shim/meson.build b/src/amd/drm-shim/meson.build
index dd0b86d547b8b..b7be863bd023e 100644
--- a/src/amd/drm-shim/meson.build
+++ b/src/amd/drm-shim/meson.build
@@ -20,7 +20,7 @@
 # IN THE SOFTWARE.
 
 libradeon_noop_drm_shim = shared_library(
-  ['radeon_noop_drm_shim'],
+  'radeon_noop_drm_shim',
   'radeon_noop_drm_shim.c',
   include_directories: [inc_include, inc_src, inc_amd],
   dependencies: dep_drm_shim,
diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
index 8ef4935ab2fb7..a5636c8827a37 100644
--- a/src/broadcom/drm-shim/meson.build
+++ b/src/broadcom/drm-shim/meson.build
@@ -19,7 +19,7 @@
 # SOFTWARE.
 
 libvc4_noop_drm_shim = shared_library(
-  ['vc4_noop_drm_shim'],
+  'vc4_noop_drm_shim',
   'vc4_noop.c',
   include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
@@ -28,10 +28,10 @@ libvc4_noop_drm_shim = shared_library(
 )
 
 libv3d_noop_drm_shim = shared_library(
-  ['v3d_noop_drm_shim'],
+  'v3d_noop_drm_shim',
   'v3d_noop.c',
   include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
   gnu_symbol_visibility : 'hidden',
   install : true,
-)
\ No newline at end of file
+)
diff --git a/src/freedreno/drm-shim/meson.build b/src/freedreno/drm-shim/meson.build
index c5fbbc6d53cc8..2b4bddbf2badb 100644
--- a/src/freedreno/drm-shim/meson.build
+++ b/src/freedreno/drm-shim/meson.build
@@ -20,7 +20,7 @@
 # IN THE SOFTWARE.
 
 libfreedreno_noop_drm_shim = shared_library(
-  ['freedreno_noop_drm_shim'],
+  'freedreno_noop_drm_shim',
   'freedreno_noop.c',
   include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
diff --git a/src/gallium/drivers/lima/drm-shim/meson.build b/src/gallium/drivers/lima/drm-shim/meson.build
index a978d3505ba3b..db1806064bbb1 100644
--- a/src/gallium/drivers/lima/drm-shim/meson.build
+++ b/src/gallium/drivers/lima/drm-shim/meson.build
@@ -20,7 +20,7 @@
 # IN THE SOFTWARE.
 
 liblima_noop_drm_shim = shared_library(
-  ['lima_noop_drm_shim'],
+  'lima_noop_drm_shim',
   'lima_noop.c',
   include_directories: [inc_include, inc_src],
   dependencies: dep_drm_shim,
diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 30d31bb52da73..e15f45a1e71b7 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -30,7 +30,7 @@ files_libintel_dev = files(
 )
 
 libintel_dev = static_library(
-  ['intel_dev'],
+  'intel_dev',
   [files_libintel_dev, sha1_h],
   include_directories : [inc_include, inc_src, inc_intel],
   dependencies : [dep_libdrm, idep_mesautil],
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 522737c9a66c2..0a968e93b8d88 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -135,7 +135,7 @@ if with_tools.contains('drm-shim')
   )
 
   libintel_stub_gpu = shared_library(
-    ['intel_noop_drm_shim'],
+    'intel_noop_drm_shim',
     'intel_noop_drm_shim.c',
     include_directories: [inc_include, inc_src, inc_intel],
     link_with: libintel_dev,
diff --git a/src/nouveau/drm-shim/meson.build b/src/nouveau/drm-shim/meson.build
index 42d9bfbdc1b8b..6e2154ae90566 100644
--- a/src/nouveau/drm-shim/meson.build
+++ b/src/nouveau/drm-shim/meson.build
@@ -20,7 +20,7 @@
 # IN THE SOFTWARE.
 
 libnouveau_noop_drm_shim = shared_library(
-  ['nouveau_noop_drm_shim'],
+  'nouveau_noop_drm_shim',
   'nouveau_noop.c',
   include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
diff --git a/src/panfrost/drm-shim/meson.build b/src/panfrost/drm-shim/meson.build
index b6976dffc50d8..5a922aee5571a 100644
--- a/src/panfrost/drm-shim/meson.build
+++ b/src/panfrost/drm-shim/meson.build
@@ -20,7 +20,7 @@
 # IN THE SOFTWARE.
 
 libpanfrost_noop_drm_shim = shared_library(
-  ['panfrost_noop_drm_shim'],
+  'panfrost_noop_drm_shim',
   'panfrost_noop.c',
   include_directories: [inc_include, inc_src],
   dependencies: dep_drm_shim,