From b482bf994b474ef72387e76c8d51f09ecc6627da Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Thu, 15 Sep 2022 14:53:48 -0400
Subject: [PATCH] Handle extra flags to Python differently.

---
 src/mlpack/bindings/python/CMakeLists.txt | 3 ++-
 src/mlpack/bindings/python/setup.py.in    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/bindings/python/CMakeLists.txt b/src/mlpack/bindings/python/CMakeLists.txt
index a2d370288b..2d240a88eb 100644
--- a/src/mlpack/bindings/python/CMakeLists.txt
+++ b/src/mlpack/bindings/python/CMakeLists.txt
@@ -26,7 +26,8 @@ macro (post_python_bindings)
             -D OpenMP_CXX_FLAGS="${OpenMP_CXX_FLAGS}"
             -D DISABLE_CFLAGS="${DISABLE_CFLAGS}"
             -D CYTHON_INCLUDE_DIRECTORIES="${CYTHON_INCLUDE_DIRECTORIES}"
-            -D CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DMLPACK_PRINT_INFO -DMLPACK_PRINT_WARN"
+            -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+            -D EXTRA_CXX_FLAGS="-DMLPACK_PRINT_INFO -DMLPACK_PRINT_WARN"
             -D OUTPUT_DIR=${CMAKE_BINARY_DIR}
             -P "${CMAKE_SOURCE_DIR}/CMake/ConfigureFile.cmake"
         BYPRODUCTS "${CMAKE_BINARY_DIR}/src/mlpack/bindings/python/setup.py"
diff --git a/src/mlpack/bindings/python/setup.py.in b/src/mlpack/bindings/python/setup.py.in
index e063348ef7..aabd85a6fb 100644
--- a/src/mlpack/bindings/python/setup.py.in
+++ b/src/mlpack/bindings/python/setup.py.in
@@ -45,6 +45,10 @@ if os.getenv('NO_BUILD') == '1':
 else:
   cxx_flags = '${CMAKE_CXX_FLAGS}'.strip()
   cxx_flags = re.sub(' +', ' ', cxx_flags)
+  extra_cxx_flags = '${EXTRA_CXX_FLAGS}'.strip()
+  extra_cxx_flags = re.sub(' +', ' ', cxx_flags)
+  cxx_flags += ' '
+  cxx_flags += extra_cxx_flags
   extra_args = ['-DBINDING_TYPE=BINDING_TYPE_PYX', '-std=c++14']
   if '${OpenMP_CXX_FLAGS}' != '':
     extra_args.append('${OpenMP_CXX_FLAGS}')