File tree Expand file tree Collapse file tree 4 files changed +10
-9
lines changed Expand file tree Collapse file tree 4 files changed +10
-9
lines changed Original file line number Diff line number Diff line change 45
45
uses : actions/cache@v4
46
46
with :
47
47
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}*') }}
50
50
restore-keys : |
51
51
${{ runner.os }}-gcc-
52
52
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ RPCLIB_VERSION='2.3.0'
60
60
PROJECT_DIR=" $( realpath $PWD ) "
61
61
SCRIPT_DIR=" $( realpath ${BASH_SOURCE[0]} ) "
62
62
63
- GCC_DIR=" ${PROJECT_DIR} /deps /gcc-${GCC_VERSION} /bin"
63
+ GCC_DIR=" ${PROJECT_DIR} /external/gcc /gcc-${GCC_VERSION} /bin"
64
64
GCC_VERSION_MAJOR=" ${GCC_VERSION%% .* } "
65
65
66
66
if [ " $( uname) " = ' Darwin' ]; then
Original file line number Diff line number Diff line change @@ -41,8 +41,9 @@ while [ $# -gt 0 ]; do
41
41
done
42
42
43
43
# 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
46
47
pushd gcc_build
47
48
48
49
echo " Downloading GCC from GNU/Linux mirror: GCC ${GCC_VERSION} ..."
@@ -63,7 +64,7 @@ source ./contrib/download_prerequisites
63
64
echo ' Building GCC from source...'
64
65
mkdir build
65
66
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
67
68
make
68
69
make install
69
70
@@ -72,11 +73,11 @@ popd # exit build
72
73
popd # exit gcc-$GCC_VERSION
73
74
popd # exit gcc_build
74
75
rm -rf gcc_build
75
- popd # exit deps
76
+ popd # exit external
76
77
77
78
# echo "Prepending GCC ${GCC_VERSION} binary directory path to user PATH variable..."
78
79
# 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"
80
81
81
82
echo ' GCC build completed successfully.'
82
83
Original file line number Diff line number Diff line change 145
145
" libc++-${CLANG_VERSION} -dev" \
146
146
" libc++abi-${CLANG_VERSION} -dev"
147
147
# 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
149
149
source " ${SCRIPT_DIR} /build_gcc.sh" --version " $GCC_VERSION "
150
150
fi
151
151
# sudo apt-get install -y \
You can’t perform that action at this time.
0 commit comments