Merge pull request #303948 from ExpidusOS/feat/llvm-git-commonify-clang (6da46d61) · Commits · nix / nixpkgs

pkgs/development/compilers/llvm/12/clang/default.nix

deleted100644 → 0

+0 −132

Original line number	Diff line number	Diff line
		{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
		, buildLlvmTools
		, fixDarwinDylibNames
		, enableManpages ? false
		}:

		let
		self = stdenv.mkDerivation ({
		pname = "clang";
		inherit version;

		src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf";
		inherit clang-tools-extra_src;

		unpackPhase = ''
		unpackFile $src
		mv clang-* clang
		sourceRoot=$PWD/clang
		unpackFile ${clang-tools-extra_src}
		mv clang-tools-extra-* $sourceRoot/tools/extra
		substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \
		--replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra'
		'';

		nativeBuildInputs = [ cmake python3 ]
		++ lib.optional enableManpages python3.pkgs.sphinx
		++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

		buildInputs = [ libxml2 libllvm ];

		cmakeFlags = [
		"-DCLANGD_BUILD_XPC=OFF"
		"-DLLVM_ENABLE_RTTI=ON"
		] ++ lib.optionals enableManpages [
		"-DCLANG_INCLUDE_DOCS=ON"
		"-DLLVM_ENABLE_SPHINX=ON"
		"-DSPHINX_OUTPUT_MAN=ON"
		"-DSPHINX_OUTPUT_HTML=OFF"
		"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
		] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
		"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
		"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
		];

		patches = [
		./purity.patch
		# https://reviews.llvm.org/D51899
		./gnu-install-dirs.patch
		(substituteAll {
		src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
		libllvmLibdir = "${libllvm.lib}/lib";
		})
		];

		postPatch = ''
		sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
		-e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
		lib/Driver/ToolChains/*.cpp
		'' + lib.optionalString stdenv.hostPlatform.isMusl ''
		sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
		'';

		outputs = [ "out" "lib" "dev" "python" ];

		postInstall = ''
		ln -sv $out/bin/clang $out/bin/cpp

		# Move libclang to 'lib' output
		moveToOutput "lib/libclang.*" "$lib"
		moveToOutput "lib/libclang-cpp.*" "$lib"
		substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
		--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \
		--replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."

		mkdir -p $python/bin $python/share/{clang,scan-view}
		mv $out/bin/{git-clang-format,scan-view} $python/bin
		if [ -e $out/bin/set-xcode-analyzer ]; then
		mv $out/bin/set-xcode-analyzer $python/bin
		fi
		mv $out/share/clang/*.py $python/share/clang
		mv $out/share/scan-view/*.py $python/share/scan-view
		rm $out/bin/c-index-test
		patchShebangs $python/bin

		mkdir -p $dev/bin
		cp bin/clang-tblgen $dev/bin
		'';

		passthru = {
		inherit libllvm;
		isClang = true;
		hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ];
		};

		meta = llvm_meta // {
		homepage = "https://clang.llvm.org/";
		description = "A C language family frontend for LLVM";
		longDescription = ''
		The Clang project provides a language front-end and tooling
		infrastructure for languages in the C language family (C, C++, Objective
		C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.
		It aims to deliver amazingly fast compiles, extremely useful error and
		warning messages and to provide a platform for building great source
		level tools. The Clang Static Analyzer and clang-tidy are tools that
		automatically find bugs in your code, and are great examples of the sort
		of tools that can be built using the Clang frontend as a library to
		parse C/C++ code.
		'';
		mainProgram = "clang";
		};
		} // lib.optionalAttrs enableManpages {
		pname = "clang-manpages";

		buildPhase = ''
		make docs-clang-man
		'';

		installPhase = ''
		mkdir -p $out/share/man/man1
		# Manually install clang manpage
		cp docs/man/*.1 $out/share/man/man1/
		'';

		outputs = [ "out" ];

		doCheck = false;

		meta = llvm_meta // {
		description = "man page for Clang ${version}";
		};
		});
		in self

pkgs/development/compilers/llvm/12/default.nix

+13 −3

Original line number	Diff line number	Diff line
		{ lowPrio, newScope, pkgs, lib, stdenv, cmake
		, preLibcCrossHeaders
		, substitute, fetchFromGitHub, fetchpatch
		, substitute, substituteAll, fetchFromGitHub, fetchpatch
		, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
		, buildLlvmTools # tools, but from the previous stage, for cross
		, targetLlvmLibraries # libraries, but from the next stage, for cross
		@@ -56,7 +56,7 @@ let
		then tools.bintools
		else bootBintools;

		in {
		in rec {

		libllvm = callPackage ./llvm {
		inherit llvm_meta;
		@@ -66,7 +66,17 @@ let
		# we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
		llvm = tools.libllvm;

		libclang = callPackage ./clang {
		libclang = callPackage ../common/clang {
		src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf";
		patches = [
		./clang/purity.patch
		# https://reviews.llvm.org/D51899
		./clang/gnu-install-dirs.patch
		(substituteAll {
		src = ../common/clang/clang-11-15-LLVMgold-path.patch;
		libllvmLibdir = "${libllvm.lib}/lib";
		})
		];
		inherit clang-tools-extra_src llvm_meta;
		};

pkgs/development/compilers/llvm/13/clang/default.nix

deleted100644 → 0

+0 −126

Original line number	Diff line number	Diff line
		{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3
		, buildLlvmTools
		, fixDarwinDylibNames
		, enableManpages ? false
		}:

		let
		self = stdenv.mkDerivation ({
		pname = "clang";
		inherit version;

		inherit src;
		sourceRoot = "${src.name}/clang";

		nativeBuildInputs = [ cmake python3 ]
		++ lib.optional enableManpages python3.pkgs.sphinx
		++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

		buildInputs = [ libxml2 libllvm ];

		cmakeFlags = [
		"-DCLANGD_BUILD_XPC=OFF"
		"-DLLVM_ENABLE_RTTI=ON"
		] ++ lib.optionals enableManpages [
		"-DCLANG_INCLUDE_DOCS=ON"
		"-DLLVM_ENABLE_SPHINX=ON"
		"-DSPHINX_OUTPUT_MAN=ON"
		"-DSPHINX_OUTPUT_HTML=OFF"
		"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
		] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
		"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
		"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
		];

		patches = [
		./purity.patch
		# https://reviews.llvm.org/D51899
		./gnu-install-dirs.patch
		# Revert of https://reviews.llvm.org/D100879
		# The malloc alignment assumption is incorrect for jemalloc and causes
		# mis-compilation in firefox.
		# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
		./revert-malloc-alignment-assumption.patch
		../../common/clang/add-nostdlibinc-flag.patch
		(substituteAll {
		src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
		libllvmLibdir = "${libllvm.lib}/lib";
		})
		];

		postPatch = ''
		(cd tools && ln -s ../../clang-tools-extra extra)
		'' + lib.optionalString stdenv.hostPlatform.isMusl ''
		sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
		'';

		outputs = [ "out" "lib" "dev" "python" ];

		postInstall = ''
		ln -sv $out/bin/clang $out/bin/cpp

		# Move libclang to 'lib' output
		moveToOutput "lib/libclang.*" "$lib"
		moveToOutput "lib/libclang-cpp.*" "$lib"
		substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
		--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \
		--replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."

		mkdir -p $python/bin $python/share/{clang,scan-view}
		mv $out/bin/{git-clang-format,scan-view} $python/bin
		if [ -e $out/bin/set-xcode-analyzer ]; then
		mv $out/bin/set-xcode-analyzer $python/bin
		fi
		mv $out/share/clang/*.py $python/share/clang
		mv $out/share/scan-view/*.py $python/share/scan-view
		rm $out/bin/c-index-test
		patchShebangs $python/bin

		mkdir -p $dev/bin
		cp bin/clang-tblgen $dev/bin
		'';

		passthru = {
		inherit libllvm;
		isClang = true;
		hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ];
		};

		meta = llvm_meta // {
		homepage = "https://clang.llvm.org/";
		description = "A C language family frontend for LLVM";
		longDescription = ''
		The Clang project provides a language front-end and tooling
		infrastructure for languages in the C language family (C, C++, Objective
		C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.
		It aims to deliver amazingly fast compiles, extremely useful error and
		warning messages and to provide a platform for building great source
		level tools. The Clang Static Analyzer and clang-tidy are tools that
		automatically find bugs in your code, and are great examples of the sort
		of tools that can be built using the Clang frontend as a library to
		parse C/C++ code.
		'';
		mainProgram = "clang";
		};
		} // lib.optionalAttrs enableManpages {
		pname = "clang-manpages";

		buildPhase = ''
		make docs-clang-man
		'';

		installPhase = ''
		mkdir -p $out/share/man/man1
		# Manually install clang manpage
		cp docs/man/*.1 $out/share/man/man1/
		'';

		outputs = [ "out" ];

		doCheck = false;

		meta = llvm_meta // {
		description = "man page for Clang ${version}";
		};
		});
		in self

pkgs/development/compilers/llvm/13/default.nix

+18 −3

Original line number	Diff line number	Diff line
		{ lowPrio, newScope, pkgs, lib, stdenv, cmake
		, preLibcCrossHeaders
		, fetchpatch
		, libxml2, python3, isl, fetchFromGitHub, substitute, overrideCC, wrapCCWith, wrapBintoolsWith
		, libxml2, python3, isl, fetchFromGitHub, substitute, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith
		, buildLlvmTools # tools, but from the previous stage, for cross
		, targetLlvmLibraries # libraries, but from the next stage, for cross
		, targetLlvm
		@@ -82,7 +82,7 @@ in let
		then tools.bintools
		else bootBintools;

		in {
		in rec {

		libllvm = callPackage ./llvm {
		inherit llvm_meta;
		@@ -92,7 +92,22 @@ in let
		# we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
		llvm = tools.libllvm;

		libclang = callPackage ./clang {
		libclang = callPackage ../common/clang {
		patches = [
		./clang/purity.patch
		# https://reviews.llvm.org/D51899
		./clang/gnu-install-dirs.patch
		# Revert of https://reviews.llvm.org/D100879
		# The malloc alignment assumption is incorrect for jemalloc and causes
		# mis-compilation in firefox.
		# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
		./clang/revert-malloc-alignment-assumption.patch
		../common/clang/add-nostdlibinc-flag.patch
		(substituteAll {
		src = ../common/clang/clang-11-15-LLVMgold-path.patch;
		libllvmLibdir = "${libllvm.lib}/lib";
		})
		];
		inherit llvm_meta;
		};

pkgs/development/compilers/llvm/14/clang/default.nix

deleted100644 → 0

+0 −129

Original line number	Diff line number	Diff line
		{ lib, stdenv, llvm_meta
		, monorepoSrc, runCommand
		, substituteAll, cmake, libxml2, libllvm, version, python3
		, buildLlvmTools
		, fixDarwinDylibNames
		, enableManpages ? false
		}:

		let
		self = stdenv.mkDerivation (rec {
		pname = "clang";
		inherit version;

		src = runCommand "${pname}-src-${version}" {} ''
		mkdir -p "$out"
		cp -r ${monorepoSrc}/cmake "$out"
		cp -r ${monorepoSrc}/${pname} "$out"
		cp -r ${monorepoSrc}/clang-tools-extra "$out"
		'';

		sourceRoot = "${src.name}/${pname}";

		nativeBuildInputs = [ cmake python3 ]
		++ lib.optional enableManpages python3.pkgs.sphinx
		++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

		buildInputs = [ libxml2 libllvm ];

		cmakeFlags = [
		"-DCLANGD_BUILD_XPC=OFF"
		"-DLLVM_ENABLE_RTTI=ON"
		] ++ lib.optionals enableManpages [
		"-DCLANG_INCLUDE_DOCS=ON"
		"-DLLVM_ENABLE_SPHINX=ON"
		"-DSPHINX_OUTPUT_MAN=ON"
		"-DSPHINX_OUTPUT_HTML=OFF"
		"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
		] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
		"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
		"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
		];

		patches = [
		./purity.patch
		# https://reviews.llvm.org/D51899
		./gnu-install-dirs.patch
		../../common/clang/add-nostdlibinc-flag.patch
		(substituteAll {
		src = ../../common/clang/clang-11-15-LLVMgold-path.patch;
		libllvmLibdir = "${libllvm.lib}/lib";
		})
		];

		postPatch = ''
		(cd tools && ln -s ../../clang-tools-extra extra)
		'' + lib.optionalString stdenv.hostPlatform.isMusl ''
		sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
		'';

		outputs = [ "out" "lib" "dev" "python" ];

		postInstall = ''
		ln -sv $out/bin/clang $out/bin/cpp

		# Move libclang to 'lib' output
		moveToOutput "lib/libclang.*" "$lib"
		moveToOutput "lib/libclang-cpp.*" "$lib"
		substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
		--replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \
		--replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."

		mkdir -p $python/bin $python/share/{clang,scan-view}
		mv $out/bin/{git-clang-format,scan-view} $python/bin
		if [ -e $out/bin/set-xcode-analyzer ]; then
		mv $out/bin/set-xcode-analyzer $python/bin
		fi
		mv $out/share/clang/*.py $python/share/clang
		mv $out/share/scan-view/*.py $python/share/scan-view
		rm $out/bin/c-index-test
		patchShebangs $python/bin

		mkdir -p $dev/bin
		cp bin/clang-tblgen $dev/bin
		'';

		passthru = {
		inherit libllvm;
		isClang = true;
		hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ];
		};

		meta = llvm_meta // {
		homepage = "https://clang.llvm.org/";
		description = "A C language family frontend for LLVM";
		longDescription = ''
		The Clang project provides a language front-end and tooling
		infrastructure for languages in the C language family (C, C++, Objective
		C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.
		It aims to deliver amazingly fast compiles, extremely useful error and
		warning messages and to provide a platform for building great source
		level tools. The Clang Static Analyzer and clang-tidy are tools that
		automatically find bugs in your code, and are great examples of the sort
		of tools that can be built using the Clang frontend as a library to
		parse C/C++ code.
		'';
		mainProgram = "clang";
		};
		} // lib.optionalAttrs enableManpages {
		pname = "clang-manpages";

		buildPhase = ''
		make docs-clang-man
		'';

		installPhase = ''
		mkdir -p $out/share/man/man1
		# Manually install clang manpage
		cp docs/man/*.1 $out/share/man/man1/
		'';

		outputs = [ "out" ];

		doCheck = false;

		meta = llvm_meta // {
		description = "man page for Clang ${version}";
		};
		});
		in self