diff options
author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-06-05 12:57:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-05 12:57:58 -0700 |
commit | ea6768d281b8c56056b04ecc5cc11380cb4fa178 (patch) | |
tree | e006f607c2fc0d0ee88dd694f4dfdc1d56c0e381 | |
parent | ba28ea06d5ca18e47d8252cb8c677d79e62b7554 (diff) | |
parent | 1e80c6d2361cf4e4c8891c4af35c84a630b622e7 (diff) | |
download | spike-ea6768d281b8c56056b04ecc5cc11380cb4fa178.zip spike-ea6768d281b8c56056b04ecc5cc11380cb4fa178.tar.gz spike-ea6768d281b8c56056b04ecc5cc11380cb4fa178.tar.bz2 |
Merge pull request #108 from riscv/dtc-error
Configure should fail if device-tree-compiler is not installed
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.ac | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -3409,6 +3409,7 @@ done done IFS=$as_save_IFS + test -z "$ac_cv_path_DTC" && ac_cv_path_DTC="no" ;; esac fi @@ -3422,6 +3423,9 @@ $as_echo "no" >&6; } fi +if test x"$DTC" == xno; then : + as_fn_error $? "device-tree-compiler not found" "$LINENO" 5 +fi cat >>confdefs.h <<_ACEOF #define DTC "$DTC" diff --git a/configure.ac b/configure.ac index ea64de7..e361877 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,8 @@ AC_PROG_CC AC_PROG_CXX AC_CHECK_TOOL([AR],[ar]) AC_CHECK_TOOL([RANLIB],[ranlib]) -AC_PATH_PROG([DTC],[dtc]) +AC_PATH_PROG([DTC],[dtc],[no]) +AS_IF([test x"$DTC" == xno],AC_MSG_ERROR([device-tree-compiler not found])) AC_DEFINE_UNQUOTED(DTC, ["$DTC"], [Path to the device-tree-compiler]) AC_C_BIGENDIAN(AC_MSG_ERROR([Spike requires a little-endian host])) |