IDK

man-group · Nov 27, 2024 · 239e74e · 239e74e
1 parent 9fdf578
commit 239e74e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/analysis_workflow.yml b/.github/workflows/analysis_workflow.yml
@@ -133,9 +133,9 @@ jobs:
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 
-          echo CMAKE_C_COMPILER=/opt/rh/gcc-toolset-10/root/bin/gcc  | tee -a $GITHUB_ENV
-          echo CMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-10/root/bin/g++  | tee -a $GITHUB_ENV
-          echo LD_LIBRARY_PATH=/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64/dyninst:${LD_LIBRARY_PATH}  | tee -a $GITHUB_ENV
+          echo CC=/opt/rh/gcc-toolset-10/root/bin/gcc | tee -a $GITHUB_ENV
+          echo CXX=/opt/rh/gcc-toolset-10/root/bin/g++ | tee -a $GITHUB_ENV
+          echo LD_LIBRARY_PATH=/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64/dyninst | tee -a $GITHUB_ENV
           echo "/opt/rh/devtoolset-10/root/usr/bin" | tee -a $GITHUB_PATH
 
           yum install -y mono-complete

diff --git a/.github/workflows/benchmark_commits.yml b/.github/workflows/benchmark_commits.yml
@@ -51,9 +51,9 @@ jobs:
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 
-          echo CMAKE_C_COMPILER=/opt/rh/gcc-toolset-10/root/bin/gcc  | tee -a $GITHUB_ENV
-          echo CMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-10/root/bin/g++  | tee -a $GITHUB_ENV
-          echo LD_LIBRARY_PATH=/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64/dyninst:${LD_LIBRARY_PATH}  | tee -a $GITHUB_ENV
+          echo CC=/opt/rh/gcc-toolset-10/root/bin/gcc | tee -a $GITHUB_ENV
+          echo CXX=/opt/rh/gcc-toolset-10/root/bin/g++ | tee -a $GITHUB_ENV
+          echo LD_LIBRARY_PATH=/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64/dyninst | tee -a $GITHUB_ENV
           echo "/opt/rh/devtoolset-10/root/usr/bin" | tee -a $GITHUB_PATH
 
           yum install -y mono-complete

diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml
@@ -74,10 +74,6 @@ jobs:
         with:
           submodules: recursive # Just in case a dep has its own third-party deps
 
-      - name: Configure sccache
-        uses: mozilla-actions/[email protected]
-        with:
-          version: "v0.4.0"
 
       - name: Windows Pagefile
         if: matrix.os == 'windows'
@@ -97,15 +93,21 @@ jobs:
           unzip tar epel-release jq wget libcurl-devel python3 \
           python3-devel python3-pip perl-IPC-Cmd
 
-          echo CMAKE_C_COMPILER=/opt/rh/gcc-toolset-10/root/bin/gcc  | tee -a $GITHUB_ENV
-          echo CMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-10/root/bin/g++  | tee -a $GITHUB_ENV
-          echo LD_LIBRARY_PATH=/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64/dyninst:${LD_LIBRARY_PATH}  | tee -a $GITHUB_ENV
+          echo CC=/opt/rh/gcc-toolset-10/root/bin/gcc | tee -a $GITHUB_ENV
+          echo CXX=/opt/rh/gcc-toolset-10/root/bin/g++ | tee -a $GITHUB_ENV
+          echo LD_LIBRARY_PATH=/opt/rh/gcc-toolset-10/root/usr/lib64:/opt/rh/gcc-toolset-10/root/usr/lib:/opt/rh/gcc-toolset-10/root/usr/lib64/dyninst | tee -a $GITHUB_ENV
           echo "/opt/rh/devtoolset-10/root/usr/bin" | tee -a $GITHUB_PATH
 
           yum install -y mono-complete
 
           yum clean all
 
+
+      - name: Configure sccache
+        uses: mozilla-actions/[email protected]
+        with:
+          version: "v0.4.0"
+
       - name: Extra envs
         # This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets
         run: |