Skip to content

Commit 8807270

Browse files
committed
[Conan] append to LDFLAGS in profile instead of overriding them
1 parent d5cc263 commit 8807270

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/python-build/action.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ runs:
9999
tools.cmake.cmaketoolchain:generator=Ninja Multi-Config
100100
tools.build:skip_test=true
101101
[buildenv]
102-
CFLAGS=-fdiagnostics-color
103-
CXXFLAGS=-fdiagnostics-color
104-
LDFLAGS=-static-libgcc -static-libstdc++ -flto=auto
102+
CFLAGS+= -fdiagnostics-color
103+
CXXFLAGS+= -fdiagnostics-color
104+
LDFLAGS+= -static-libgcc -static-libstdc++ -flto=auto
105105
EOF
106106
107107
# Custom recipes needed for some of the dependencies.

.github/workflows/wheel.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ jobs:
7070
tools.cmake.cmaketoolchain:generator=Ninja Multi-Config
7171
tools.build:skip_test=true
7272
[buildenv]
73-
CFLAGS=-fdiagnostics-color
74-
CXXFLAGS=-fdiagnostics-color
75-
LDFLAGS=-static-libgcc -static-libstdc++ -flto=auto
73+
CFLAGS+= -fdiagnostics-color
74+
CXXFLAGS+= -fdiagnostics-color
75+
LDFLAGS+= -static-libgcc -static-libstdc++ -flto=auto
7676
EOF
7777
- name: Install Conan recipes
7878
run: |

scripts/dev/install-locally.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ tools.build:skip_test=true
4343
tools.build.cross_building:can_run=true
4444
tools.cmake.cmaketoolchain:generator=Ninja Multi-Config
4545
[buildenv]
46-
CFLAGS=-march=native -fdiagnostics-color
47-
CXXFLAGS=-march=native -fdiagnostics-color
48-
LDFLAGS=-static-libstdc++ -flto=auto
46+
CFLAGS+= -march=native -fdiagnostics-color
47+
CXXFLAGS+= -march=native -fdiagnostics-color
48+
LDFLAGS+= -static-libstdc++ -flto=auto
4949
EOF
5050
python_profile="$PWD/profile-python.local.conan"
5151
cat <<- EOF > "$python_profile"
@@ -57,9 +57,9 @@ tools.cmake.cmaketoolchain:generator=Ninja Multi-Config
5757
tools.build.cross_building:can_run=true
5858
tools.build:skip_test=true
5959
[buildenv]
60-
CFLAGS=-march=native -fdiagnostics-color
61-
CXXFLAGS=-march=native -fdiagnostics-color
62-
LDFLAGS=-static-libgcc -static-libstdc++ -flto=auto
60+
CFLAGS+= -march=native -fdiagnostics-color
61+
CXXFLAGS+= -march=native -fdiagnostics-color
62+
LDFLAGS+= -static-libgcc -static-libstdc++ -flto=auto
6363
EOF
6464

6565
# Build and install alpaqa dependencies

0 commit comments

Comments
 (0)