diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67c0e33..64138d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -235,7 +235,7 @@ jobs:
           WINEDLLOVERRIDES: "mscoree,mshtml="
         run: |
           make features
-          make WITH_LTO=true -j $(nproc)
+          make -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -269,7 +269,7 @@ jobs:
           WINEDLLOVERRIDES: "mscoree,mshtml="
         run: |
           make features
-          make WITH_LTO=true -j $(nproc)
+          make -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
diff --git a/carla b/carla
index ae96ff6..7a4b81c 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit ae96ff6974d2aa879fc29486a09dab33e4d4a53b
+Subproject commit 7a4b81cf81403fdb2e3fd093274dd568d97d87f5
diff --git a/deps/Makefile b/deps/Makefile
index 42342e8..42686fe 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -28,8 +28,8 @@ BASE_FLAGS += -I../include/mingw-std-threads
 endif
 
 ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
-LINK_FLAGS += -fno-strict-aliasing -flto -Werror=odr -Werror=lto-type-mismatch
+BASE_FLAGS += -fno-strict-aliasing -flto -ffat-lto-objects
+LINK_FLAGS += -fno-strict-aliasing -flto -ffat-lto-objects -Werror=odr -Werror=lto-type-mismatch
 endif
 
 BUILD_C_FLAGS += -fno-finite-math-only
diff --git a/plugins/Makefile b/plugins/Makefile
index e801b9f..50cf8f9 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -552,7 +552,7 @@ BASE_FLAGS += -DNOPLUGINS
 endif
 
 ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
+BASE_FLAGS += -fno-strict-aliasing -flto -ffat-lto-objects
 endif
 
 BUILD_C_FLAGS += -std=gnu11
diff --git a/src/Makefile b/src/Makefile
index 47e0600..81d5a6a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -62,7 +62,7 @@ BASE_FLAGS += -DHEADLESS
 endif
 
 ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
+BASE_FLAGS += -fno-strict-aliasing -flto -ffat-lto-objects
 endif
 
 BUILD_C_FLAGS += -std=gnu11
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 9d8b3db..7d676d7 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -155,7 +155,7 @@ BASE_FLAGS += -DHEADLESS
 endif
 
 ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
+BASE_FLAGS += -fno-strict-aliasing -flto -ffat-lto-objects
 endif
 
 BUILD_C_FLAGS += -std=gnu11
@@ -191,7 +191,7 @@ EXTRA_LIBS += $(shell pkg-config --libs jansson libarchive samplerate speexdsp)
 endif
 
 ifeq ($(WITH_LTO),true)
-LINK_FLAGS += -fno-strict-aliasing -flto -Werror=odr -Werror=lto-type-mismatch
+LINK_FLAGS += -fno-strict-aliasing -flto -ffat-lto-objects -fwhole-program -Werror=odr -Werror=lto-type-mismatch
 endif
 
 # --------------------------------------------------------------