Skip to content

Commit

Permalink
fix make's impurity on /bin/sh
Browse files Browse the repository at this point in the history
This is important when using tooling like BEAR to generate
compilation database since the used glibc version needs to match
for LD_PRELOAD to work. It might be also beneficial when building
on systems other than NixOS with nix develop since /bin/sh might
be not bash (which is what all nix devs use for testing).
This fix is not perfect because Makefile.config.in itself is
also build with make but strictly better than the status quo.
  • Loading branch information
Mic92 committed Jul 18, 2020
1 parent 3f01fa1 commit 56b5846
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions Makefile.config.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ LIBLZMA_LIBS = @LIBLZMA_LIBS@
OPENSSL_LIBS = @OPENSSL_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
SHELL = @SHELL@
SODIUM_LIBS = @SODIUM_LIBS@
SQLITE3_LIBS = @SQLITE3_LIBS@
bash = @bash@
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ AC_PROG_CXX
AC_PROG_CPP

AC_CHECK_TOOL([AR], [ar])
AC_CHECK_TOOL([SHELL], [sh])

# Use 64-bit file system calls so that we can support files > 2 GiB.
AC_SYS_LARGEFILE
Expand Down

0 comments on commit 56b5846

Please sign in to comment.