update gcc build, moved to external

nervosys · May 6, 2024 · 030ebf1 · 030ebf1
1 parent 1d3da18
commit 030ebf1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
@@ -45,8 +45,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            "~/gcc-${GCC_VERSION}"
-          key: ${{ runner.os }}-gcc-${{ hashFiles('**/*gcc-${GCC_VERSION}*') }}
+            "~/external/gcc-${GCC_VERSION}"
+          key: ${{ runner.os }}-gcc-${{ hashFiles('**/*external/gcc-${GCC_VERSION}*') }}
           restore-keys: |
             ${{ runner.os }}-gcc-
 

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -60,7 +60,7 @@ RPCLIB_VERSION='2.3.0'
 PROJECT_DIR="$(realpath $PWD)"
 SCRIPT_DIR="$(realpath ${BASH_SOURCE[0]})"
 
-GCC_DIR="${PROJECT_DIR}/deps/gcc-${GCC_VERSION}/bin"
+GCC_DIR="${PROJECT_DIR}/external/gcc/gcc-${GCC_VERSION}/bin"
 GCC_VERSION_MAJOR="${GCC_VERSION%%.*}"
 
 if [ "$(uname)" = 'Darwin' ]; then

diff --git a/scripts/build_gcc.sh b/scripts/build_gcc.sh
@@ -41,8 +41,9 @@ while [ $# -gt 0 ]; do
 done
 
 # create dependencies directory if it does not exist.
-mkdir -p deps/gcc_build
-pushd deps
+mkdir -p ./external/gcc
+mkdir -p ./external/gcc_build
+pushd external
 pushd gcc_build
 
 echo "Downloading GCC from GNU/Linux mirror: GCC ${GCC_VERSION}..."
@@ -63,7 +64,7 @@ source ./contrib/download_prerequisites
 echo 'Building GCC from source...'
 mkdir build
 pushd build
-../configure --prefix="${PROJECT_DIR}/deps/gcc-${GCC_VERSION}" --disable-multilib
+../configure --prefix="${PROJECT_DIR}/external/gcc/gcc-${GCC_VERSION}" --disable-multilib
 make
 make install
 
@@ -72,11 +73,11 @@ popd  # exit build
 popd  # exit gcc-$GCC_VERSION
 popd  # exit gcc_build
 rm -rf gcc_build
-popd  # exit deps
+popd  # exit external
 
 # echo "Prepending GCC ${GCC_VERSION} binary directory path to user PATH variable..."
 # echo 'WARNING: This may have some undesirable side-effects.'
-# echo "export PATH=\$HOME/AutonomySim/deps/gcc-${GCC_VERSION}/bin:\$PATH" | tee -a "${HOME}/.bashrc"
+# echo "export PATH=\$HOME/AutonomySim/external/gcc-${GCC_VERSION}/bin:\$PATH" | tee -a "${HOME}/.bashrc"
 
 echo 'GCC build completed successfully.'
 

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -145,7 +145,7 @@ else
         "libc++-${CLANG_VERSION}-dev" \
         "libc++abi-${CLANG_VERSION}-dev"
     # Conditionally download and build GCC from source
-    if [ ! -d "${PROJECT_DIR}/deps/gcc-${GCC_VERSION}/bin" ]; then
+    if [ ! -d "${PROJECT_DIR}/external/gcc/gcc-${GCC_VERSION}/bin" ]; then
         source "${SCRIPT_DIR}/build_gcc.sh" --version "$GCC_VERSION"
     fi
     #sudo apt-get install -y \