Skip to content

Commit 18801e5

Browse files
authored
Remove compiler workarounds (#18)
Instead let the project's own Conan profile worry about these.
1 parent 1a62b69 commit 18801e5

File tree

3 files changed

+3
-50
lines changed

3 files changed

+3
-50
lines changed

docker/debian/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,8 @@ CXX_VER=${CXX_VER%%.*}
221221
cat >> $(conan config home)/global.conf <<EOT
222222
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
223223
EOT
224-
if [[ ${CXX_VER} -ge 19 ]]; then
225-
cat >> $(conan config home)/global.conf <<EOT
226-
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
227-
EOT
228-
fi
229224
EOF
225+
230226
# Print the Conan profile to verify the configuration.
231227
RUN conan profile show
232228

docker/rhel/Dockerfile

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -103,24 +103,6 @@ tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
103103
EOT
104104
EOF
105105

106-
# Apply workaround for gcc 12.1 bug, if needed (fixed in gcc 12.4)
107-
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651
108-
RUN <<EOF
109-
mkdir test && cd test
110-
cat >main.cpp <<EOT
111-
#include <string>
112-
std::string f() { return "_" + std::string(" "); }
113-
EOT
114-
${CXX} -std=c++20 -Wall -Werror -O3 -c main.cpp || touch fail
115-
if [[ -f fail ]]; then
116-
cat >> $(conan config home)/global.conf <<EOT
117-
tools.build:cxxflags=['-Wno-restrict']
118-
EOT
119-
fi
120-
cd .. && rm -rf test
121-
EOF
122-
123-
124106
# Print the Conan profile to verify the configuration.
125107
RUN conan profile show
126108

@@ -189,12 +171,8 @@ CXX_VER=${CXX_VER%%.*}
189171
cat >> $(conan config home)/global.conf <<EOT
190172
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
191173
EOT
192-
if [[ ${CXX_VER} -ge 19 ]]; then
193-
cat >> $(conan config home)/global.conf <<EOT
194-
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
195-
EOT
196-
fi
197174
EOF
175+
198176
# Print the Conan profile to verify the configuration.
199177
RUN conan profile show
200178

docker/ubuntu/Dockerfile

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,6 @@ tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
121121
EOT
122122
EOF
123123

124-
# Apply workaround for gcc 12.1 bug, if needed (fixed in gcc 12.4)
125-
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651
126-
RUN <<EOF
127-
mkdir test && cd test
128-
cat >main.cpp <<EOT
129-
#include <string>
130-
std::string f() { return "_" + std::string(" "); }
131-
EOT
132-
${CXX} -std=c++20 -Wall -Werror -O3 -c main.cpp || touch fail
133-
if [[ -f fail ]]; then
134-
cat >> $(conan config home)/global.conf <<EOT
135-
tools.build:cxxflags=['-Wno-restrict']
136-
EOT
137-
fi
138-
cd .. && rm -rf test
139-
EOF
140-
141124
# Print the Conan profile to verify the configuration.
142125
RUN conan profile show
143126

@@ -218,12 +201,8 @@ CXX_VER=${CXX_VER%%.*}
218201
cat >> $(conan config home)/global.conf <<EOT
219202
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
220203
EOT
221-
if [[ ${CXX_VER} -ge 19 ]]; then
222-
cat >> $(conan config home)/global.conf <<EOT
223-
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
224-
EOT
225-
fi
226204
EOF
205+
227206
# Print the Conan profile to verify the configuration.
228207
RUN conan profile show
229208

0 commit comments

Comments
 (0)