File tree Expand file tree Collapse file tree 3 files changed +3
-50
lines changed
Expand file tree Collapse file tree 3 files changed +3
-50
lines changed Original file line number Diff line number Diff line change @@ -221,12 +221,8 @@ CXX_VER=${CXX_VER%%.*}
221221cat >> $(conan config home)/global.conf <<EOT
222222tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
223223EOT
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
229224EOF
225+
230226# Print the Conan profile to verify the configuration.
231227RUN conan profile show
232228
Original file line number Diff line number Diff line change @@ -103,24 +103,6 @@ tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
103103EOT
104104EOF
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.
125107RUN conan profile show
126108
@@ -189,12 +171,8 @@ CXX_VER=${CXX_VER%%.*}
189171cat >> $(conan config home)/global.conf <<EOT
190172tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
191173EOT
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
197174EOF
175+
198176# Print the Conan profile to verify the configuration.
199177RUN conan profile show
200178
Original file line number Diff line number Diff line change @@ -121,23 +121,6 @@ tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
121121EOT
122122EOF
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.
142125RUN conan profile show
143126
@@ -218,12 +201,8 @@ CXX_VER=${CXX_VER%%.*}
218201cat >> $(conan config home)/global.conf <<EOT
219202tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
220203EOT
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
226204EOF
205+
227206# Print the Conan profile to verify the configuration.
228207RUN conan profile show
229208
You can’t perform that action at this time.
0 commit comments