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 @@ -213,12 +213,8 @@ CXX_VER=${CXX_VER%%.*}
213213cat >> $(conan config home)/global.conf <<EOT
214214tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
215215EOT
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
221216EOF
217+
222218# Print the Conan profile to verify the configuration.
223219RUN conan profile show
224220
Original file line number Diff line number Diff line change @@ -101,24 +101,6 @@ tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
101101EOT
102102EOF
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.
123105RUN conan profile show
124106
@@ -186,12 +168,8 @@ CXX_VER=${CXX_VER%%.*}
186168cat >> $(conan config home)/global.conf <<EOT
187169tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
188170EOT
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
194171EOF
172+
195173# Print the Conan profile to verify the configuration.
196174RUN conan profile show
197175
Original file line number Diff line number Diff line change @@ -118,23 +118,6 @@ tools.build:compiler_executables={"c": "${CC}", "cpp": "${CXX}"}
118118EOT
119119EOF
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.
139122RUN conan profile show
140123
@@ -207,12 +190,8 @@ CXX_VER=${CXX_VER%%.*}
207190cat >> $(conan config home)/global.conf <<EOT
208191tools.build:compiler_executables={"c" : "${CC}" , "cpp" : "${CXX}" }
209192EOT
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
215193EOF
194+
216195# Print the Conan profile to verify the configuration.
217196RUN conan profile show
218197
You can’t perform that action at this time.
0 commit comments