diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-26 16:31:49 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-26 16:50:06 -0400 |
| commit | 3c00ca03a251693e58eb4e3c247ee1f640215783 (patch) | |
| tree | cb273471a97970ef80f2da382edd72737a8cca66 /pkgs/development/tools/build-managers/meson | |
| parent | 8c0c24bf93b675c058d9c720d6c7665ba4deb90d (diff) | |
| download | nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.tar nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.tar.gz nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.tar.bz2 nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.tar.lz nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.tar.xz nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.tar.zst nixpkgs-3c00ca03a251693e58eb4e3c247ee1f640215783.zip | |
meson: Don't set CC and CXX
I've since convinced upstream to not use such vars for the build platform during cross. Finally!
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 15b0a5ffcd0..977ffe837ec 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -90,8 +90,6 @@ python3Packages.buildPythonApplication rec { # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; - inherit (stdenv) cc; - isCross = stdenv.targetPlatform != stdenv.hostPlatform; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 8d76ecdaf32..aef18e65ea1 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -25,7 +25,7 @@ mesonConfigurePhase() { echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}" + meson build $mesonFlags "${mesonFlagsArray[@]}" cd build if ! [[ -v enableParallelBuilding ]]; then |