Skip to content

Commit fcb162b

Browse files
committed
Remove compiler workarounds
1 parent e834dd5 commit fcb162b

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
@@ -213,12 +213,8 @@ CXX_VER=${CXX_VER%%.*}
213213
cat >> $(conan config home)/global.conf <<EOT
214214
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
215215
EOT
216-
if [[ ${CXX_VER} -ge 19 ]]; then
217-
cat >> $(conan config home)/global.conf <<EOT
218-
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
219-
EOT
220-
fi
221216
EOF
217+
222218
# Print the Conan profile to verify the configuration.
223219
RUN conan profile show
224220

docker/rhel/Dockerfile

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

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

@@ -186,12 +168,8 @@ CXX_VER=${CXX_VER%%.*}
186168
cat >> $(conan config home)/global.conf <<EOT
187169
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
188170
EOT
189-
if [[ ${CXX_VER} -ge 19 ]]; then
190-
cat >> $(conan config home)/global.conf <<EOT
191-
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
192-
EOT
193-
fi
194171
EOF
172+
195173
# Print the Conan profile to verify the configuration.
196174
RUN conan profile show
197175

docker/ubuntu/Dockerfile

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

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

@@ -207,12 +190,8 @@ CXX_VER=${CXX_VER%%.*}
207190
cat >> $(conan config home)/global.conf <<EOT
208191
tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
209192
EOT
210-
if [[ ${CXX_VER} -ge 19 ]]; then
211-
cat >> $(conan config home)/global.conf <<EOT
212-
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
213-
EOT
214-
fi
215193
EOF
194+
216195
# Print the Conan profile to verify the configuration.
217196
RUN conan profile show
218197

0 commit comments

Comments
 (0)