Skip to content

Commit 030ebf1

Browse files
committed
update gcc build, moved to external
1 parent 1d3da18 commit 030ebf1

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

.github/workflows/test_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
uses: actions/cache@v4
4646
with:
4747
path: |
48-
"~/gcc-${GCC_VERSION}"
49-
key: ${{ runner.os }}-gcc-${{ hashFiles('**/*gcc-${GCC_VERSION}*') }}
48+
"~/external/gcc-${GCC_VERSION}"
49+
key: ${{ runner.os }}-gcc-${{ hashFiles('**/*external/gcc-${GCC_VERSION}*') }}
5050
restore-keys: |
5151
${{ runner.os }}-gcc-
5252

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RPCLIB_VERSION='2.3.0'
6060
PROJECT_DIR="$(realpath $PWD)"
6161
SCRIPT_DIR="$(realpath ${BASH_SOURCE[0]})"
6262

63-
GCC_DIR="${PROJECT_DIR}/deps/gcc-${GCC_VERSION}/bin"
63+
GCC_DIR="${PROJECT_DIR}/external/gcc/gcc-${GCC_VERSION}/bin"
6464
GCC_VERSION_MAJOR="${GCC_VERSION%%.*}"
6565

6666
if [ "$(uname)" = 'Darwin' ]; then

scripts/build_gcc.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ while [ $# -gt 0 ]; do
4141
done
4242

4343
# create dependencies directory if it does not exist.
44-
mkdir -p deps/gcc_build
45-
pushd deps
44+
mkdir -p ./external/gcc
45+
mkdir -p ./external/gcc_build
46+
pushd external
4647
pushd gcc_build
4748

4849
echo "Downloading GCC from GNU/Linux mirror: GCC ${GCC_VERSION}..."
@@ -63,7 +64,7 @@ source ./contrib/download_prerequisites
6364
echo 'Building GCC from source...'
6465
mkdir build
6566
pushd build
66-
../configure --prefix="${PROJECT_DIR}/deps/gcc-${GCC_VERSION}" --disable-multilib
67+
../configure --prefix="${PROJECT_DIR}/external/gcc/gcc-${GCC_VERSION}" --disable-multilib
6768
make
6869
make install
6970

@@ -72,11 +73,11 @@ popd # exit build
7273
popd # exit gcc-$GCC_VERSION
7374
popd # exit gcc_build
7475
rm -rf gcc_build
75-
popd # exit deps
76+
popd # exit external
7677

7778
# echo "Prepending GCC ${GCC_VERSION} binary directory path to user PATH variable..."
7879
# echo 'WARNING: This may have some undesirable side-effects.'
79-
# echo "export PATH=\$HOME/AutonomySim/deps/gcc-${GCC_VERSION}/bin:\$PATH" | tee -a "${HOME}/.bashrc"
80+
# echo "export PATH=\$HOME/AutonomySim/external/gcc-${GCC_VERSION}/bin:\$PATH" | tee -a "${HOME}/.bashrc"
8081

8182
echo 'GCC build completed successfully.'
8283

scripts/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ else
145145
"libc++-${CLANG_VERSION}-dev" \
146146
"libc++abi-${CLANG_VERSION}-dev"
147147
# Conditionally download and build GCC from source
148-
if [ ! -d "${PROJECT_DIR}/deps/gcc-${GCC_VERSION}/bin" ]; then
148+
if [ ! -d "${PROJECT_DIR}/external/gcc/gcc-${GCC_VERSION}/bin" ]; then
149149
source "${SCRIPT_DIR}/build_gcc.sh" --version "$GCC_VERSION"
150150
fi
151151
#sudo apt-get install -y \

0 commit comments

Comments
 (0)