Get rid of -Ofast on Linux

This seem to make some miscompilation that lead to hangs
This commit is contained in:
Ilya Fedin 2023-05-03 18:02:39 +04:00 committed by John Preston
parent b881d24a5a
commit 37f5576c38
2 changed files with 4 additions and 7 deletions

View File

@ -51,7 +51,7 @@ FROM builder-base AS builder
ENV AR gcc-ar
ENV RANLIB gcc-ranlib
ENV NM gcc-nm
ENV CFLAGS {% if DEBUG %}-g{% endif %} -Ofast {% if LTO %}{{ CFLAGS_LTO }}{% endif %} -pipe -fPIC -fstack-protector-all -fstack-clash-protection -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
ENV CFLAGS {% if DEBUG %}-g{% endif %} -O3 {% if LTO %}{{ CFLAGS_LTO }}{% endif %} -pipe -fPIC -fstack-protector-all -fstack-clash-protection -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
ENV CXXFLAGS $CFLAGS
FROM builder AS patches
@ -187,7 +187,7 @@ FROM builder AS opus
RUN git clone -b v1.3.1 --depth=1 {{ GIT }}/xiph/opus.git \
&& cd opus \
&& ./autogen.sh \
&& ./configure --enable-float-approx \
&& ./configure \
&& make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/opus-cache" install \
&& cd .. \
@ -304,10 +304,7 @@ RUN git clone -b v0.8.1 --depth=1 {{ GIT }}/libjxl/libjxl.git \
FROM builder AS rnnoise
RUN git clone -b master --depth=1 {{ GIT }}/desktop-app/rnnoise \
&& cd rnnoise \
&& cmake -GNinja -B build . \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_C_FLAGS="$CFLAGS -DFLOAT_APPROX" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -DFLOAT_APPROX" \
&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=None \
&& cmake --build build --parallel \
&& mkdir -p "{{ LibrariesPath }}/rnnoise-cache/usr/local/include" \
&& cp "include/rnnoise.h" "{{ LibrariesPath }}/rnnoise-cache/usr/local/include/" \

2
cmake

@ -1 +1 @@
Subproject commit c03178c09be027627321704d3a9b81b032159dbd
Subproject commit d625b4d1ba9dbcbb2f7a8f6555e1658569aaa093