cygwin-dll-link: improvements from testing on native cygwin (#476301) (5a2694bc) · Commits · nix / nixpkgs

pkgs/build-support/cc-wrapper/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -603,7 +603,7 @@ stdenvNoCC.mkDerivation {
		installPhase =
		if targetPlatform.isCygwin then
		''
		echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out
		echo addToSearchPath "_linkDeps_inputPath" "${cc_solib}/bin" >> $out
		# Work around build failure caused by the gnulib workaround for
		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after
		# gnulib is updated in core packages (e.g. iconv, gnupatch, gnugrep)

pkgs/build-support/setup-hooks/cygwin-dll-link.sh

deleted100644 → 0

+0 −77

Original line number	Diff line number	Diff line
		# shellcheck shell=bash

		addLinkDLLPaths() {
		addToSearchPath "LINK_DLL_FOLDERS" "$1/lib"
		addToSearchPath "LINK_DLL_FOLDERS" "$1/bin"
		}

		# shellcheck disable=SC2154
		addEnvHooks "$targetOffset" addLinkDLLPaths

		addOutputDLLPaths() {
		for output in $(getAllOutputNames); do
		addToSearchPath "LINK_DLL_FOLDERS" "${!output}/lib"
		addToSearchPath "LINK_DLL_FOLDERS" "${!output}/bin"
		done
		}

		postInstallHooks+=(addOutputDLLPaths)

		_dllDeps() {
		"$OBJDUMP" -p "$1" \
		\| sed -n 's/.DLL Name: $.$/\1/p' \
		\| sort -u
		}

		_linkDeps() {
		local target="$1" dir="$2" check="$3"
		echo 'target:' "$target"
		local dll
		_dllDeps "$target" \| while read -r dll; do
		echo ' dll:' "$dll"
		if [[ -e "$dir/$dll" ]]; then continue; fi
		# Locate the DLL - it should be an executable file on $LINK_DLL_FOLDERS.
		local dllPath
		if ! dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"; then
		if [[ -z "$check" \|\| -n "${allowedImpureDLLsMap[$dll]}" ]]; then
		continue
		fi
		echo unable to find "$dll" in "$LINK_DLL_FOLDERS" >&2
		exit 1
		fi
		echo ' linking to:' "$dllPath"
		CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir"
		# That DLL might have its own (transitive) dependencies,
		# so add also all DLLs from its directory to be sure.
		_linkDeps "$dllPath" "$dir" ""
		done
		}

		linkDLLs() {
		# shellcheck disable=SC2154
		if [ ! -d "$prefix" ]; then return; fi
		(
		set -e
		shopt -s globstar nullglob

		local -a allowedImpureDLLsArray
		concatTo allowedImpureDLLsArray allowedImpureDLLs

		local -A allowedImpureDLLsMap;

		for dll in "${allowedImpureDLLsArray[@]}"; do
		allowedImpureDLLsMap[$dll]=1
		done

		cd "$prefix"

		# Iterate over any DLL that we depend on.
		local target
		for target in {bin,libexec}/*/.{exe,dll}; do
		[[ ! -f "$target" \|\| ! -x "$target" ]] \|\|
		_linkDeps "$target" "$(dirname "$target")" "1"
		done
		)
		}

		fixupOutputHooks+=(linkDLLs)

pkgs/development/compilers/gcc/common/builder.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,13 @@ originalAttrs:
		fi
		done
		''
		+ lib.optionalString stdenv.targetPlatform.isCygwin ''
		targetBinDir="''${targetConfig+$targetConfig/}bin"
		for i in "''${!outputBin}/$targetLibDir"/cyg*.dll; do
		mkdir -p "''${!outputLib}/$targetBinDir"
		mv "$i" "''${!outputLib}/$targetBinDir"/
		done
		''
		# if cross-compiling, link from $lib/lib to $lib/${targetConfig}.
		# since native-compiles have $lib/lib as a directory (not a
		# symlink), this ensures that in every case we can assume that

pkgs/os-specific/cygwin/cygwin-dll-link-hook/cygwin-dll-link.sh

0 → 100644

+142 −0

Original line number	Diff line number	Diff line
		# shellcheck shell=bash

		_moveDLLsToLib() {
		if [[ "${dontMoveDLLsToLib-}" ]]; then return; fi
		# shellcheck disable=SC2154
		moveToOutput "bin/*.dll" "${!outputLib}"
		}

		preFixupHooks+=(_moveDLLsToLib)

		declare _linkDeps_inputPath _linkDeps_outputPath

		_addOutputDLLPaths() {
		for output in $(getAllOutputNames); do
		addToSearchPath _linkDeps_outputPath "${!output}/bin"
		done
		}

		preFixupHooks+=(_addOutputDLLPaths)

		_dllDeps() {
		@objdump@ -p "$1" \
		\| sed -n 's/.DLL Name: $.$/\1/p' \
		\| sort -u
		}

		declare -Ag _linkDeps_visited

		_linkDeps() {
		local target="$1" dir="$2"

		# canonicalise these for the dictionary
		target=$(realpath -s "$target")
		dir=$(realpath -s "$dir")

		if [[ -v _linkDeps_visited[$target] ]]; then
		echo "_linkDeps: $target was already linked." 1>&2
		return
		fi
		if [[ ! -f $target \|\| ! -x $target ]]; then
		echo "_linkDeps: $target is not an executable file, skipping." 1>&2
		return
		fi

		local output inOutput
		for output in $outputs ; do
		if [[ $target == "${!output}"* && ! -L $target ]]; then
		echo "_linkDeps: $target is in $output (${!output})." 1>&2
		inOutput=1
		break
		fi
		done

		echo 'target:' "$target"
		local dll
		while read -r dll; do
		echo ' dll:' "$dll"
		local dllPath=$dir/$dll
		if [[ -v _linkDeps_visited[$dllPath] ]]; then
		echo "_linkDeps: $dll was already linked into $dir." 1>&2
		continue
		fi
		if [[ -L $dllPath ]]; then
		echo ' already linked'
		dllPath=$(realpath -s "$(readlink "$dllPath")")
		_linkDeps "$dllPath" "$dir"
		elif [[ -e $dllPath ]]; then
		echo ' already exits'
		_linkDeps "$dllPath" "$dir"
		else
		if [[ $dll = cygwin1.dll ]]; then
		dllPath=/bin/cygwin1.dll
		else
		# This intentionally doesn't use $dir because we want to prefer
		# dependencies that are already linked next to the target.
		local searchPath realTarget
		searchPath=$_linkDeps_outputPath:$_linkDeps_inputPath:$HOST_PATH
		if [[ -L $target ]]; then
		searchPath=$searchPath:$(dirname "$(readlink "$target")")
		fi
		searchPath=$(dirname "$target"):$searchPath
		if ! dllPath=$(PATH="$searchPath" type -P "$dll"); then
		if [[ -z $inOutput \|\| -n ${allowedImpureDLLsMap[$dll]} ]]; then
		continue
		fi
		echo unable to find "$dll" in "$searchPath" >&2
		exit 1
		fi
		fi
		echo ' linking to:' "$dllPath"
		CYGWIN+=' winsymlinks:nativestrict' ln -sr "$dllPath" "$dir"
		_linkDeps "$dllPath" "$dir"
		fi
		_linkDeps_visited[$dir/$dll]=1
		done < <(_dllDeps "$target")
		wait $!
		}

		# linkDLLsDir can be used to override the destination path for links. This is
		# useful if you're trying to link dependencies of libraries into the directory
		# containing an executable.
		#
		# Arguments can be a file or directory path. Directories are searched
		# recursively.
		linkDLLs() {
		# shellcheck disable=SC2154
		(
		set -e
		shopt -s globstar nullglob dotglob

		local -a allowedImpureDLLsArray
		concatTo allowedImpureDLLsArray allowedImpureDLLs

		local -A allowedImpureDLLsMap;

		for dll in "${allowedImpureDLLsArray[@]}"; do
		allowedImpureDLLsMap[$dll]=1
		done

		local target file
		for target in "$@"; do
		# Iterate over any DLL that we depend on.
		if [[ -f "$target" ]]; then
		_linkDeps "$target" "${linkDLLsDir-$(dirname "$target")}"
		elif [[ -d "$target" ]]; then
		for file in "${target%/}"/*/.{exe,dll}; do
		_linkDeps "$file" "${linkDLLsDir-$(dirname "$file")}"
		done
		else
		echo "linkDLLs: $target is not a file or directory, skipping." 1>&2
		fi
		done
		)
		}

		_linkDLLs() {
		# shellcheck disable=SC2154
		if [[ ! -d $prefix \|\| ${dontLinkDLLs-} ]]; then return; fi
		linkDLLs "$prefix"/{bin,lib,libexec}/
		}

		fixupOutputHooks+=(_linkDLLs)

pkgs/os-specific/cygwin/cygwin-dll-link-hook/default.nix

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		{
		lib,
		makeSetupHook,
		binutils-unwrapped,
		stdenv,
		callPackage,
		}:
		makeSetupHook {
		name = "cygwin-dll-link-hook";
		substitutions = {
		objdump = "${lib.getBin binutils-unwrapped}/${stdenv.targetPlatform.config}/bin/objdump";
		};

		passthru.tests = callPackage ./tests { };
		} ./cygwin-dll-link.sh