diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-13 12:39:34 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 12:39:34 -0600 |
| commit | e25a34371645180e69ece2f781bcbdaf472b8b25 (patch) | |
| tree | 7fb4d6d8e213b005d7eaa143d9900ab7553722dd /pkgs/development/tools | |
| parent | 6825c0c18be3d90ee8d05599a7bebf0a4cfebe2a (diff) | |
| download | nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.tar nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.tar.gz nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.tar.bz2 nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.tar.lz nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.tar.xz nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.tar.zst nixlib-e25a34371645180e69ece2f781bcbdaf472b8b25.zip | |
cmake: don't force gcc, use more general cc/c++
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 4 | ||||
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7dd97b8a2067..97c02cd9cc12 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -86,8 +86,8 @@ stdenv.mkDerivation rec { ++ ["--"] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ] ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}g++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}gcc" + "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" + "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 50e9e93b015f..c796c31cb70a 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -37,8 +37,8 @@ cmakeConfigurePhase() { # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and # strip. Otherwise they are taken to be relative to the source root of # the package being built. - cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ $cmakeFlags" - cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags" + cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags" + cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags" cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags" cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags" cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags" |