diff --git a/configure.ac b/configure.ac
index 15d84bc9d2..fc6bd2a20e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,6 +445,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then
   AX_CHECK_COMPILE_FLAG([-Wdeprecated-register],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-deprecated-register"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-implicit-fallthrough"],,[[$CXXFLAG_WERROR]])
   AX_CHECK_COMPILE_FLAG([-Wdeprecated-copy],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-deprecated-copy"],,[[$CXXFLAG_WERROR]])
+  AX_CHECK_COMPILE_FLAG([-Wpsabi],[NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-psabi"],,[[$CXXFLAG_WERROR]])
 fi
 
 dnl Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
diff --git a/depends/packages/libfmt.mk b/depends/packages/libfmt.mk
index b1ceb8ecc4..b9cf248587 100644
--- a/depends/packages/libfmt.mk
+++ b/depends/packages/libfmt.mk
@@ -9,13 +9,13 @@ $(package)_config_opts_x86_64_mingw32=-DCMAKE_TOOLCHAIN_FILE=$(BASEDIR)/cmake/mi
 endef
 
 define $(package)_config_cmds
-  cmake -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true $($(package)_config_opts) .
+  $($(package)_cmake) -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true
 endef
 
 define $(package)_build_cmds
-  $(MAKE) && \
-  mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \
-  cp -a include/* $($(package)_staging_dir)$(host_prefix)/include/ && \
-  mkdir -p $($(package)_staging_dir)$(host_prefix)/lib && \
-  cp -a libfmt.a $($(package)_staging_dir)$(host_prefix)/lib/
-endef
\ No newline at end of file
+  $(MAKE)
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+endef