diff --git a/.travis.yml b/.travis.yml
index d73bc85e50..f372103130 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ matrix:
           name: wxGTK 2 UTF-8 Ubuntu 18.04
         - dist: bionic
           compiler: gcc
-          env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl --disable-webview" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11 LDFLAGS=-Wl,--no-as-needed" wxUSE_XVFB=1
+          env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl --disable-webview" wxMAKEFILE_CXXFLAGS=-std=c++11 wxMAKEFILE_LDFLAGS=-Wl,--no-as-needed wxUSE_XVFB=1
           name: wxGTK 3 STL Ubuntu 18.04
         - dist: bionic
           compiler: clang
diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
index 2f711ca42d..6858ef60d8 100755
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -69,6 +69,13 @@ case $wxTOOLSET in
 
         [ "$wxALLOW_WARNINGS" = 1 ] || export CXXFLAGS='-Werror -Wno-error=cpp'
 
+        if [ -n "$wxMAKEFILE_CXXFLAGS" ]; then
+            wxMAKEFILE_FLAGS="CXXFLAGS=$wxMAKEFILE_CXXFLAGS"
+        fi
+        if [ -n "$wxMAKEFILE_LDFLAGS" ]; then
+            wxMAKEFILE_FLAGS="$wxMAKEFILE_FLAGS LDFLAGS=$wxMAKEFILE_LDFLAGS"
+        fi
+
         echo 'travis_fold:start:building'
         echo 'Building...'
         make -k $wxBUILD_ARGS