Downgrade c++ CentOS7

thinker0 · Apr 20, 2022 · a68fbde · a68fbde
1 parent 2546396
commit a68fbde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/docker/compile/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7
@@ -28,8 +28,8 @@ RUN yum -y install \
       cmake \
       openssl-devel \
       file \
-      devtoolset-8-gcc \
-      devtoolset-8-gcc-c++ \
+      gcc \
+      gcc-c++ \
       git \
       glibc-langpack-en \
       kernel-devel \
@@ -56,16 +56,13 @@ RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/
       && /tmp/bazel.sh \
       && rm -rf /tmp/bazel.sh
 
-ENV PATH /opt/rh/devtoolset-8/root/bin:/opt/rh/rh-python38/root/usr/bin:${PATH}
-ENV LD_LIBRARY_PATH /opt/rh/devtoolset-8/root/lib64:/opt/rh/rh-python38/root/usr/lib64:/usr/local/lib:${LD_LIBRARY_PATH}
-ENV MANPATH /opt/rh/devtoolset-8/root/usr/share/man:/opt/rh/rh-python38/root/usr/share/man
+ENV PATH /opt/rh/rh-python38/root/usr/bin:${PATH}
+ENV LD_LIBRARY_PATH /opt/rh/rh-python38/root/usr/lib64:/usr/local/lib:${LD_LIBRARY_PATH}
+ENV MANPATH /opt/rh/rh-python38/root/usr/share/man
 ENV PKG_CONFIG_PATH /opt/rh/rh-python38/root/usr/lib64/pkgconfig:${PKG_CONFIG_PATH}
 
 RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \
       && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python \
-      && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3.8 /usr/bin/python3.8 \
-      && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/gcc /usr/bin/gcc \
-      && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/g++ /usr/bin/g++ \
-      && /usr/bin/ln -sfT /opt/rh/devtoolset-8/root/bin/cpp /usr/bin/cpp
+      && /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3.8 /usr/bin/python3.8
 
 ADD scripts/compile-platform.sh /compile-platform.sh
diff --git a/third_party/gperftools/gperftools.BUILD b/third_party/gperftools/gperftools.BUILD
@@ -20,7 +20,7 @@ mac_script = "\n".join(common_script + [
 
 linux_script = "\n".join(common_script + [
      './configure --prefix=$$INSTALL_DIR --enable-shared=no CPPFLAGS=-I$$UNWIND_DIR/include LDFLAGS="-L$$UNWIND_DIR/lib -lunwind" --enable-frame-pointers',
-     'make install CPPFLAGS="-I$$UNWIND_DIR/include -std=c++14" LDFLAGS="-L$$UNWIND_DIR/lib -lunwind"',
+     'make install CPPFLAGS="-I$$UNWIND_DIR/include -std=c++1y" LDFLAGS="-L$$UNWIND_DIR/lib -lunwind"',
      'rm -rf $$TMP_DIR',
 ])