Skip to content
Snippets Groups Projects
Commit 93cd5a31 authored by Jérôme Charaoui's avatar Jérôme Charaoui
Browse files

assume clean build environment, see DEBBUG-915222

This is part of a fix for reproducible builds where usrmerge may or may
not be in effect on the build system. We need to be able to pass the
BASH envvar to autotools so its able to correctly determine the correct
path for bash. The lines removed here were added to fix DEBBUG-346303
but should not be required on a clean build environment, where BASH
remains unset unless the current shell is actually BASH, and when it is,
should return the correct path to the bash executable and not /bin/sh.
parent 1cdf2abc
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- [build] make build reproducible regardless of usrmerge (DEBBUG-915222)
- [core] silence exit code message unless --debug is used - [core] silence exit code message unless --debug is used
## [1.2.0] - 2021-01-21 ## [1.2.0] - 2021-01-21
......
...@@ -9,9 +9,6 @@ AM_INIT_AUTOMAKE([foreign]) ...@@ -9,9 +9,6 @@ AM_INIT_AUTOMAKE([foreign])
# Checks for programs. # Checks for programs.
# BASH may already be set in the shell, if the admin then changes the
# the /bin/sh symlink to a non-bash shell, all hell will break lose.
unset BASH
AC_PATH_PROGS(BASH, bash, "no", [$PATH:/bin:/usr/bin:/usr/sbin]) AC_PATH_PROGS(BASH, bash, "no", [$PATH:/bin:/usr/bin:/usr/sbin])
if test x$BASH = "xno"; then if test x$BASH = "xno"; then
AC_MSG_ERROR([bash is required]) AC_MSG_ERROR([bash is required])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment