mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 09:34:36 +00:00
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides
We _do_ want minimum versions in our packages.
This commit is contained in:
parent
9b579843d4
commit
b984c227d2
pkgs
development/tools
servers/sql/mysql
@ -53,10 +53,6 @@ cmakeConfigurePhase() {
|
|||||||
# we never want to use the global macOS SDK
|
# we never want to use the global macOS SDK
|
||||||
cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
|
cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
|
||||||
|
|
||||||
# disable OSX deployment target
|
|
||||||
# we don't want our binaries to have a "minimum" OSX version
|
|
||||||
cmakeFlags="-DCMAKE_OSX_DEPLOYMENT_TARGET= $cmakeFlags"
|
|
||||||
|
|
||||||
# correctly detect our clang compiler
|
# correctly detect our clang compiler
|
||||||
cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags"
|
cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags"
|
||||||
|
|
||||||
|
@ -15,10 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ];
|
buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [ "-DCCLS_VERSION=${version}" ];
|
||||||
"-DCCLS_VERSION=${version}"
|
|
||||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.macosVersionMin or ""}"
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti")
|
cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti")
|
||||||
|
@ -26,7 +26,6 @@ stdenv.mkDerivation {
|
|||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DSYSTEM_CLANG=ON"
|
"-DSYSTEM_CLANG=ON"
|
||||||
"-DCLANG_CXX=ON"
|
"-DCLANG_CXX=ON"
|
||||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.macosVersionMin or ""}"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
shell = runtimeShell;
|
shell = runtimeShell;
|
||||||
|
@ -31,7 +31,6 @@ self = stdenv.mkDerivation rec {
|
|||||||
outputs = [ "out" "static" ];
|
outputs = [ "out" "static" ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.macosVersionMin or ""}" # For std::shared_timed_mutex.
|
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
|
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
|
||||||
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
|
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
|
||||||
"-DWITH_ROUTER=OFF" # It may be packaged separately.
|
"-DWITH_ROUTER=OFF" # It may be packaged separately.
|
||||||
|
Loading…
Reference in New Issue
Block a user