Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use ISL package #36

Merged
merged 1 commit into from
Aug 13, 2024
Merged

fix: use ISL package #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN set -eux; \
git \
flex \
libgmp-dev \
libisl-dev \
libmpc-dev \
libmpfr-dev \
texinfo \
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ The build process works currently only on **x86-based Linux** systems. The follo

* Netwide Assembler (NASM)
* GNU Make, GNU Binutils, cmake
* Tools and libraries to build *linux*, *binutils* and *gcc* (e.g. flex, bison, MPFR library, GMP library, MPC library)
* Tools and libraries to build *linux*, *binutils* and *gcc* (e.g. flex, bison, MPFR library, ISL library, GMP library, MPC library)
* Rust

On Debian-based systems the packets can be installed by executing:
```
sudo apt-get install cmake nasm libmpfr-dev libmpc-dev libgmp-dev flex bison
sudo apt-get install cmake nasm libmpfr-dev libisl-dev libmpc-dev libgmp-dev flex bison
```

Note: If issues arise during the build, try using requirements.sh to check the versions of the necessary packets and the configuration of the LD_LIBRARY_PATH (it should contain the MPFR library, GMP library and MPC library).
Expand Down
6 changes: 4 additions & 2 deletions requirements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/bin/bash

if echo "$LD_LIBRARY_PATH" | grep -q libgmp && echo "$LD_LIBRARY_PATH" | grep -q libmpc && echo "$LD_LIBRARY_PATH" | grep -q libmpfr; then
echo "LD_LIBRARY_PATH contains MPFR library, GMP library and MPC library"
if echo "$LD_LIBRARY_PATH" | grep -q libgmp && echo "$LD_LIBRARY_PATH" | grep -q libisl && echo "$LD_LIBRARY_PATH" | grep -q libmpc && echo "$LD_LIBRARY_PATH" | grep -q libmpfr; then
echo "LD_LIBRARY_PATH contains MPFR library, ISL library, GMP library, and MPC library"
elif ! echo "$LD_LIBRARY_PATH" | grep -q libgmp; then
echo "LD_LIBRARY_PATH missing GMP library"
elif ! echo "$LD_LIBRARY_PATH" | grep -q libisl; then
echo "LD_LIBRARY_PATH missing ISL library"
elif ! echo "$LD_LIBRARY_PATH" | grep -q libmpc; then
echo "LD_LIBRARY_PATH missing MPC library"
elif ! echo "$LD_LIBRARY_PATH" | grep -q libmpfr; then
Expand Down
3 changes: 0 additions & 3 deletions toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ fi

if [ ! -d "gcc" ]; then
git clone $CLONE_DEPTH https://github.com/hermit-os/gcc.git
wget ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.15.tar.bz2 -O isl-0.15.tar.bz2
tar jxf isl-0.15.tar.bz2
mv isl-0.15 gcc/isl
fi

if [ ! -d "hermit" ]; then
Expand Down