diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk
index 305a4c2ccc..ecf633003a 100644
--- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk
@@ -11,7 +11,6 @@ PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${
 PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon"
 PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info"
 PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System."
-PKG_TOOLCHAIN="meson"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \
diff --git a/packages/addons/addon-depends/mpd-mpc/package.mk b/packages/addons/addon-depends/mpd-mpc/package.mk
index d97d1cc827..44b0d5d716 100644
--- a/packages/addons/addon-depends/mpd-mpc/package.mk
+++ b/packages/addons/addon-depends/mpd-mpc/package.mk
@@ -9,5 +9,4 @@ PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libiconv libmpdclient"
 PKG_LONGDESC="Command-line client for MPD."
-PKG_TOOLCHAIN="meson"
 PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/audio/pipewire/package.mk b/packages/audio/pipewire/package.mk
index d5c20f6aab..109b1fb207 100644
--- a/packages/audio/pipewire/package.mk
+++ b/packages/audio/pipewire/package.mk
@@ -9,7 +9,6 @@ PKG_SITE="https://pipewire.org"
 PKG_URL="https://github.com/PipeWire/pipewire/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpthread-stubs dbus ncurses alsa-lib systemd libsndfile libusb"
 PKG_LONGDESC="PipeWire is a server and user space API to deal with multimedia pipeline"
-PKG_TOOLCHAIN="meson"
 
 if [ "${BLUETOOTH_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" bluez sbc ldacBT libfreeaptx"
diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk
index a81f108163..03537b276f 100644
--- a/packages/compress/lz4/package.mk
+++ b/packages/compress/lz4/package.mk
@@ -10,7 +10,6 @@ PKG_URL="https://github.com/lz4/lz4/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="lz4 data compressor/decompressor"
-PKG_TOOLCHAIN="cmake"
 
 configure_package() {
   PKG_CMAKE_SCRIPT="${PKG_BUILD}/build/cmake/CMakeLists.txt"
diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
index 7adfcc06be..1c583d6d36 100644
--- a/packages/compress/zstd/package.mk
+++ b/packages/compress/zstd/package.mk
@@ -10,7 +10,6 @@ PKG_URL="https://github.com/facebook/zstd/releases/download/v${PKG_VERSION}/${PK
 PKG_DEPENDS_HOST="ccache:host meson:host ninja:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast real-time compression algorithm."
-PKG_TOOLCHAIN="meson"
 
 configure_package() {
   PKG_MESON_SCRIPT="${PKG_BUILD}/build/meson/meson.build"
diff --git a/packages/debug/libva-utils/package.mk b/packages/debug/libva-utils/package.mk
index f210202545..45a25f607c 100644
--- a/packages/debug/libva-utils/package.mk
+++ b/packages/debug/libva-utils/package.mk
@@ -8,7 +8,6 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/01org/libva-utils"
 PKG_URL="https://github.com/intel/libva-utils/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Libva-utils is a collection of tests for VA-API (VIdeo Acceleration API)"
-PKG_TOOLCHAIN="meson"
 
 if [ "${DISPLAYSERVER}" = "x11" ]; then
   PKG_DEPENDS_TARGET="toolchain libva libdrm libX11"
diff --git a/packages/debug/vadumpcaps/package.mk b/packages/debug/vadumpcaps/package.mk
index 26751f7075..8d7596510d 100644
--- a/packages/debug/vadumpcaps/package.mk
+++ b/packages/debug/vadumpcaps/package.mk
@@ -9,7 +9,6 @@ PKG_SITE="https://github.com/fhvwy/vadumpcaps"
 PKG_URL="https://github.com/fhvwy/vadumpcaps/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="This is a utility to show all capabilities of a VAAPI device/driver."
 PKG_DEPENDS_TARGET="toolchain libva"
-PKG_TOOLCHAIN="make"
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk
index bafd429fa6..1f68b31e0c 100644
--- a/packages/debug/xorg-intel-gpu-tools/package.mk
+++ b/packages/debug/xorg-intel-gpu-tools/package.mk
@@ -9,7 +9,6 @@ PKG_DEPENDS_TARGET="toolchain cairo procps-ng"
 PKG_SITE="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
 PKG_URL="https://www.x.org/releases/individual/app/igt-gpu-tools-${PKG_VERSION}.tar.xz"
 PKG_LONGDESC="Test suite and tools for DRM/KMS drivers"
-PKG_TOOLCHAIN="meson"
 
 PKG_MESON_OPTS_TARGET="-Dchamelium=disabled \
                        -Ddocs=disabled \
diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk
index 00fc4ca52a..7c858cc3fa 100644
--- a/packages/devel/fribidi/package.mk
+++ b/packages/devel/fribidi/package.mk
@@ -10,7 +10,6 @@ PKG_SITE="http://fribidi.freedesktop.org/"
 PKG_URL="https://github.com/fribidi/fribidi/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A bidirectional algorithm library."
-PKG_TOOLCHAIN="meson"
 PKG_BUILD_FLAGS="+pic"
 
 PKG_MESON_OPTS_TARGET="-Ddeprecated=false \
diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index e4558b5c72..2ba667182e 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -11,7 +11,6 @@ PKG_URL="https://download.gnome.org/sources/glib/$(get_pkg_version_maj_min)/${PK
 PKG_DEPENDS_HOST="libffi:host pcre2:host Python3:host meson:host ninja:host"
 PKG_DEPENDS_TARGET="toolchain pcre2 zlib libffi Python3:host util-linux"
 PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation."
-PKG_TOOLCHAIN="meson"
 
 PKG_MESON_OPTS_HOST="-Ddefault_library=static \
                      -Dinstalled_tests=false \
diff --git a/packages/devel/pcre2/package.mk b/packages/devel/pcre2/package.mk
index d7f8daa546..f9c223b514 100644
--- a/packages/devel/pcre2/package.mk
+++ b/packages/devel/pcre2/package.mk
@@ -10,7 +10,6 @@ PKG_URL="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_VER
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A set of functions that implement regular expression pattern matching using the same syntax."
-PKG_TOOLCHAIN="cmake"
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \
diff --git a/packages/devel/spdlog/package.mk b/packages/devel/spdlog/package.mk
index 046b3a314c..2acc277a3e 100644
--- a/packages/devel/spdlog/package.mk
+++ b/packages/devel/spdlog/package.mk
@@ -9,6 +9,9 @@ PKG_SITE="https://github.com/gabime/spdlog"
 PKG_URL="https://github.com/gabime/spdlog/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libfmt"
 PKG_LONGDESC="Very fast, header only, C++ logging library."
-PKG_TOOLCHAIN="cmake"
 
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_TESTS=OFF"
+PKG_CMAKE_OPTS_TARGET="-DCMAKE_CXX_STANDARD=14 \
+                       -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
+                       -DSPDLOG_FMT_EXTERNAL=ON \
+                       -DSPDLOG_BUILD_EXAMPLE=OFF \
+                       -DSPDLOG_BUILD_TESTS=OFF"
diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk
index 00e62ef691..6915571900 100644
--- a/packages/graphics/harfbuzz/package.mk
+++ b/packages/graphics/harfbuzz/package.mk
@@ -10,7 +10,6 @@ PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PKG_VERSION}/harfbuzz-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain cairo freetype glib"
 PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine."
-PKG_TOOLCHAIN="meson"
 
 PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
                        -Dcairo=enabled \
diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk
index b8c7ce8592..4b9415ef0b 100644
--- a/packages/graphics/libdrm/package.mk
+++ b/packages/graphics/libdrm/package.mk
@@ -10,7 +10,6 @@ PKG_SITE="https://dri.freedesktop.org"
 PKG_URL="https://dri.freedesktop.org/libdrm/libdrm-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libpciaccess"
 PKG_LONGDESC="The userspace interface library to kernel DRM services."
-PKG_TOOLCHAIN="meson"
 
 get_graphicdrivers
 
diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index 9cbc12d2c7..81a79449eb 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -10,7 +10,6 @@ PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain expat libdrm Mako:host"
 PKG_LONGDESC="Mesa is a 3-D graphics library with an API."
-PKG_TOOLCHAIN="meson"
 
 get_graphicdrivers
 
diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk
index 3bfe5e1d75..290bc07ddb 100644
--- a/packages/multimedia/intel-vaapi-driver/package.mk
+++ b/packages/multimedia/intel-vaapi-driver/package.mk
@@ -11,7 +11,6 @@ PKG_SITE="https://01.org/linuxmedia"
 PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libva libdrm"
 PKG_LONGDESC="intel-vaapi-driver: VA-API user mode driver for Intel GEN Graphics family"
-PKG_TOOLCHAIN="meson"
 
 if [ "${DISPLAYSERVER}" = "x11" ]; then
   DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no"
diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk
index 66496da69e..109e65a7f7 100644
--- a/packages/multimedia/libva/package.mk
+++ b/packages/multimedia/libva/package.mk
@@ -10,7 +10,6 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://01.org/linuxmedia"
 PKG_URL="https://github.com/intel/libva/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Libva is an implementation for VA-API (VIdeo Acceleration API)."
-PKG_TOOLCHAIN="meson"
 
 if [ "${DISPLAYSERVER}" = "x11" ]; then
   PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm"
diff --git a/packages/multimedia/nv-codec-headers/package.mk b/packages/multimedia/nv-codec-headers/package.mk
index 5ef9f37546..f8d349f2eb 100644
--- a/packages/multimedia/nv-codec-headers/package.mk
+++ b/packages/multimedia/nv-codec-headers/package.mk
@@ -9,7 +9,6 @@ PKG_SITE="https://github.com/FFmpeg/nv-codec-headers"
 PKG_URL="https://github.com/FFmpeg/nv-codec-headers/archive/n${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="FFmpeg version of headers required to interface with Nvidias codec APIs."
-PKG_TOOLCHAIN="make"
 
 makeinstall_target(){
   make DESTDIR=${SYSROOT_PREFIX} PREFIX=/usr install
diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk
index 1258d316ed..b204d0f9aa 100644
--- a/packages/sysutils/libevdev/package.mk
+++ b/packages/sysutils/libevdev/package.mk
@@ -11,7 +11,6 @@ PKG_URL="http://www.freedesktop.org/software/libevdev/${PKG_NAME}-${PKG_VERSION}
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="libevdev is a wrapper library for evdev devices."
 PKG_BUILD_FLAGS="+pic"
-PKG_TOOLCHAIN="meson"
 
 PKG_MESON_OPTS_TARGET=" \
   -Ddefault_library=shared \