Patch cadical script to preserve CXXFLAGS

CyanoKobalamyne · Jul 9, 2024 · 05688f2 · 05688f2
1 parent 23f3e05
commit 05688f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/contrib/cxxflags-append.patch b/contrib/cxxflags-append.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/setup-cadical.sh b/contrib/setup-cadical.sh
+index 2ec9594..273757e 100755
+--- a/contrib/setup-cadical.sh
++++ b/contrib/setup-cadical.sh
+@@ -23,7 +23,7 @@ git checkout $CADICAL_VERSION
+ if [[ -d "build" ]]; then
+     echo "$SCRIPT_NAME: $DEPS_DIR/cadical/build exists, skipping configure step"
+ else
+-    CXXFLAGS=-fPIC ./configure
++    CXXFLAGS="${CXXFLAGS:-} -fPIC" ./configure
+ fi
+ make
+
diff --git a/contrib/setup-smt-switch.sh b/contrib/setup-smt-switch.sh
@@ -63,6 +63,7 @@ if [ ! -d "$DEPS/smt-switch" ]; then
     git clone https://github.com/CyanoKobalamyne/smt-switch
     cd smt-switch
     git checkout -f $SMT_SWITCH_VERSION
+    git apply $DIR/cxxflags-append.patch
     ./contrib/setup-btor.sh
     if [ $cvc5_home = default ]; then
         ./contrib/setup-cvc5.sh