diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-28 00:08:48 -0400 |
|---|---|---|
| committer | John Cotton Ericson <jcericson@macos-ny-2.office.obsidian.systems> | 2020-05-12 00:44:44 -0400 |
| commit | 1ac5398589916a6a433e845342c9b85c4c52f5dc (patch) | |
| tree | 4e525c4c01cdc5a79105de31d962ba024833f69d /pkgs/development/tools | |
| parent | f7a93031a284d39e303e98006a82250e3139cee9 (diff) | |
| download | nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.gz nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.bz2 nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.lz nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.xz nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.tar.zst nixlib-1ac5398589916a6a433e845342c9b85c4c52f5dc.zip | |
*-wrapper; Switch from `infixSalt` to `suffixSalt`
I hate the thing too even though I made it, and rather just get rid of it. But we can't do that yet. In the meantime, this brings us more inline with autoconf and will make it slightly easier for me to write a pkg-config wrapper, which we need.
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/cross-tools-flags.patch | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 756e0cf71001..52a4c0ca7198 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -63,8 +63,10 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} - # BUILD_CC and BUILD_CXX are used to bootstrap cmake - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags" + '' + # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake + + '' + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; configureFlags = [ diff --git a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch index f0e4230d7ec2..da28a309719e 100644 --- a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch +++ b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch @@ -4,7 +4,7 @@ diff -ur texinfo-6.5/configure texinfo-6.5-patched/configure @@ -23281,7 +23281,7 @@ # env -i gives this build host configure a clean environment; # consequently, we have to re-initialize $PATH. - env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ + env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ - PATH="$PATH" \ + PATH="$PATH" CFLAGS="$NATIVE_TOOLS_CFLAGS" LDFLAGS="$NATIVE_TOOLS_LDFLAGS" \ tools_only=1 \ |