Skip to content

Commit

Permalink
Fix issue with DISABLE_ADA check and make sure compile.sh also uses i…
Browse files Browse the repository at this point in the history
…t for consistency
  • Loading branch information
flavioc committed Dec 23, 2024
1 parent ea26028 commit 900ffd7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bootstrap-funcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ compile_first_glibc() {

compile_full_gcc() {
local ada="ada"
if [ -n $DISABLE_ADA ]; then
if [ -n "$DISABLE_ADA" ]; then
ada=""
fi
print_info "Cross compiling GCC"
Expand Down
14 changes: 9 additions & 5 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,10 @@ install_mpc() {
}

install_gcc() {
local ada="ada"
if [ -n "$DISABLE_ADA" ]; then
ada=""
fi
print_info "Compiling GCC"
cp -R $SOURCE/$GCC_SRC $GCC_SRC.compiler
cd $GCC_SRC.compiler &&
Expand All @@ -542,17 +546,17 @@ install_gcc() {
--disable-bootstrap \
--with-local-prefix="$SYS_ROOT" \
--disable-nls \
--enable-languages=c,c++,ada \
--enable-languages=c,c++,$ada \
--disable-libstdcxx-pch \
--with-system-zlib \
--with-native-system-header-dir="$SYS_ROOT/include" \
--enable-checking=release \
--disable-libcilkrts \
--disable-libssp
cp -v Makefile{,.orig} &&
--disable-libssp &&
cp -v Makefile{,.orig} &&
sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:$SYS_ROOT:$CROSS_TOOLS:g" \
Makefile.orig >Makefile
make -j$PROCS AS_FOR_TARGET="$AS" LD_FOR_TARGET="$LD" all &&
Makefile.orig >Makefile &&
make -j$PROCS AS_FOR_TARGET="$AS" LD_FOR_TARGET="$LD" all &&
make -j$PROCS install &&
cd ..
}
Expand Down

0 comments on commit 900ffd7

Please sign in to comment.