pyrox.dev / nixpkgs
lol
fork atom

cmake: don't force gcc, use more general cc/c++

Will Dietz e25a3437 6825c0c1

+4 -4
unified split
+2 -2
pkgs/development/tools/build-managers/cmake/default.nix
··· 86 ++ ["--"] 87 ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ] 88 ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 89 - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}g++" 90 - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}gcc" 91 "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" 92 "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" 93 "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
··· 86 ++ ["--"] 87 ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ] 88 ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 89 + "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" 90 + "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" 91 "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" 92 "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" 93 "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
+2 -2
pkgs/development/tools/build-managers/cmake/setup-hook.sh
··· 37 # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and 38 # strip. Otherwise they are taken to be relative to the source root of 39 # the package being built. 40 - cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ $cmakeFlags" 41 - cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags" 42 cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags" 43 cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags" 44 cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags"
··· 37 # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and 38 # strip. Otherwise they are taken to be relative to the source root of 39 # the package being built. 40 + cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags" 41 + cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags" 42 cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags" 43 cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags" 44 cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags"