nrubsig.kpaste.net RSS
Difference between
modified post 422ddbd by Anonymous on Wed 20th Nov 2024 16:05
original post c0a9 by Anonymous on Wed 20th Nov 2024 15:52
Download diff
Show
old version |
new version |
both versions
| 1 | 1 | diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install | |
| 2 | 2 | index 019f038..7080906 100644 | |
| 3 | 3 | --- a/cygwin/Makefile.install | |
| 4 | 4 | +++ b/cygwin/Makefile.install | |
| 5 | 5 | @@ -103,14 +103,18 @@ installdest: | |
| 6 | 6 | [[ -x $(CYGWIN_BASEPATH)/bin/shcomp.exe ]] && cp -f $(CYGWIN_BASEPATH)/bin/shcomp.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/bin/shcomp.exe || true | |
| 7 | 7 | cp $(PROJECT_BASEDIR_DIR)/cygwin/cygwin_ksh93/ksh.kshrc $(DESTDIR)/$(CYGWIN_BASEPATH)/etc/ksh.kshrc | |
| 8 | 8 | @ printf '# Packaging libs\n' | |
| 9 | 9 | + set -o errexit -o pipefail ; \ | |
| 10 | 10 | + typeset msbuildpath="$$(which MSBuild.exe)" ; \ | |
| 11 | 11 | + typeset vsbasepath="$${msbuildpath%*/Community/*}" ; \ | |
| 12 | 12 | + test -d "$${vsbasepath}" || { printf "vsbasepath not found\n" 1>&2 ; exit 1 ; }; \ | |
| 13 | 13 | if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \ | |
| 14 | 14 | cp \ | |
| 15 | 15 | - "$$(find '/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community' -ipath '*/x64/*/VCRUNTIME140D.dll' | head -n 1)" \ | |
| 16 | - | + "$$(find "$${vsbasepath}/Community" -ipath '*/x64/*/VCRUNTIME140D.dll' | head -n 1)" \ | |
| 16 | + | + "$$(find "$${vsbasepath}/Community" -ipath '*/x64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \ | |
| 17 | 17 | $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ | |
| 18 | 18 | cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x64/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ | |
| 19 | 19 | else \ | |
| 20 | 20 | cp \ | |
| 21 | 21 | - "$$(find '/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community' -ipath '*/x86/*/VCRUNTIME140D.dll' | head -n 1)" \ | |
| 22 | - | + "$$(find "$${vsbasepath}/Community" -ipath '*/x86/*/VCRUNTIME140D.dll' | head -n 1)" \ | |
| 22 | + | + "$$(find "$${vsbasepath}/Community" -ipath '*/x86/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \ | |
| 23 | 23 | $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ | |
| 24 | 24 | cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x86/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \ | |
| 25 | 25 | fi | |
| 26 | 26 |
Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.