diff options
author | Gereon Kremer <gereon.kremer@cs.rwth-aachen.de> | 2021-03-27 10:41:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-27 09:41:49 +0000 |
commit | 4b7e392eca42f89d103c5eb74157a44d4b40fe4b (patch) | |
tree | 649e24b292ac6b6dba11fe4a0e5df69ab4406019 /configure.sh | |
parent | 1ac0ebabb80f68c6c666d1eae1588c0950a6f2f7 (diff) |
Refactor ANTLR3 dependency (#6202)
This PR refactors our first, and arguably most fragile, dependency.
Right now all dependencies need to be manually installed (by calling the appropriate contrib/get-X script). For optional dependencies, we additionally need to enable them when calling the configure script (or via ccmake).
This PR is the first step in refactoring all dependencies to be automatically build (if required) as an external project.
Note that this not only eliminates the need to call contrib scripts, but also simplifies cross compilation: as all dependencies are now built within the build folders, every build folder has its own copy which may use different toolchains.
Diffstat (limited to 'configure.sh')
-rwxr-xr-x | configure.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/configure.sh b/configure.sh index 43925a504..6e54caa09 100755 --- a/configure.sh +++ b/configure.sh @@ -66,7 +66,6 @@ The following flags enable optional packages (disable with --no-<option name>). Optional Path to Optional Packages: --abc-dir=PATH path to top level of ABC source tree - --antlr-dir=PATH path to ANTLR C headers and libraries --cadical-dir=PATH path to top level of CaDiCaL source tree --cryptominisat-dir=PATH path to top level of CryptoMiniSat source tree --glpk-dir=PATH path to top level of GLPK installation @@ -144,7 +143,6 @@ arm64=default werror=default abc_dir=default -antlr_dir=default cadical_dir=default cryptominisat_dir=default glpk_dir=default @@ -292,9 +290,6 @@ do --abc-dir) die "missing argument to $1 (try -h)" ;; --abc-dir=*) abc_dir=${1##*=} ;; - --antlr-dir) die "missing argument to $1 (try -h)" ;; - --antlr-dir=*) antlr_dir=${1##*=} ;; - --cadical-dir) die "missing argument to $1 (try -h)" ;; --cadical-dir=*) cadical_dir=${1##*=} ;; @@ -339,11 +334,9 @@ done if [ "$arm64" == "ON" ]; then echo "Setting up dependencies for ARM 64-bit build" - contrib/get-antlr-3.4 --host=aarch64-linux-gnu || exit 1 contrib/get-gmp-dev --host=aarch64-linux-gnu || exit 1 elif [ "$win64" == "ON" ]; then echo "Setting up dependencies for Windows 64-bit build" - contrib/get-antlr-3.4 --host=x86_64-w64-mingw32 || exit 1 contrib/get-gmp-dev --host=x86_64-w64-mingw32 || exit 1 fi @@ -426,8 +419,6 @@ cmake_opts="" && cmake_opts="$cmake_opts -DUSE_SYMFPU=$symfpu" [ "$abc_dir" != default ] \ && cmake_opts="$cmake_opts -DABC_DIR=$abc_dir" -[ "$antlr_dir" != default ] \ - && cmake_opts="$cmake_opts -DANTLR_DIR=$antlr_dir" [ "$cadical_dir" != default ] \ && cmake_opts="$cmake_opts -DCADICAL_DIR=$cadical_dir" [ "$cryptominisat_dir" != default ] \ |