stdenv, cmake: drop --oldincludedir
Without the change the build of upcoming `sqlite-3.49.0` will fail as: > Error: Unknown option --oldincludedir > Try: 'configure --help' for options Looking at https://www.gnu.org/prep/standards/html_node/Directory-Variables.html it feels like it's something that predates gcc and it should be an alias to `--includedir=`. Let's just drop the setting of `--oldincludedir=` (and `cmake` equivalent).
This commit is contained in:
parent
0cd8ae654b
commit
fe5e11faed
@ -85,7 +85,7 @@ _multioutConfig() {
|
||||
|
||||
prependToVar configureFlags \
|
||||
--bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \
|
||||
--includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \
|
||||
--includedir="${!outputInclude}"/include \
|
||||
--mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \
|
||||
--docdir="${!outputDoc}"/share/doc/"${shareDocName}" \
|
||||
--libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \
|
||||
|
@ -93,7 +93,6 @@ cmakeConfigurePhase() {
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin"
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin"
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include"
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man"
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info"
|
||||
prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user