Revert "pixi: Test if the CI is still red if we don't remove conda-fo…

…rge compilation flags" This reverts commit ca23397.
stack-of-tasks · Oct 22, 2024 · 59378a3 · 59378a3
1 parent 4563cad
commit 59378a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pixi.toml b/pixi.toml
@@ -35,6 +35,7 @@ scripts = ["scripts/activation.bat"]
 # We must avoid to set CMAKE_CXX_FLAGS because of WIN32
 # https://discourse.cmake.org/t/strictly-appending-to-cmake-lang-flags/6478
 configure = { cmd = [
+  "CXXFLAGS=$PINOCCHIO_CXX_FLAGS",
   "cmake",
   "-G",
   "Ninja",

diff --git a/scripts/activation.sh b/scripts/activation.sh
@@ -1,6 +1,15 @@
 #! /bin/bash
 # Activation script
 
+# Remove flags setup from cxx-compiler
+unset CFLAGS
+unset CPPFLAGS
+unset CXXFLAGS
+unset DEBUG_CFLAGS
+unset DEBUG_CPPFLAGS
+unset DEBUG_CXXFLAGS
+unset LDFLAGS
+
 # Setup ccache
 export CMAKE_CXX_COMPILER_LAUNCHER=ccache