mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 09:43:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[icu] Avoid renaming link.exe inside msys -- insert into middle of path instead.

Browse Source
This commit is contained in:
Robert Schumacher 2017-04-24 18:58:17 -07:00
parent 3ee2b37df9
commit 7fe89742db
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/icu/portfile.cmake
View File

@ -16,11 +16,12 @@ vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
# Acquire tools
vcpkg_acquire_msys(MSYS_ROOT)
set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH}") # no idea why, but when PATH is appended to instead of prepended, the build freezes
# Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}")
set(ENV{PATH} "${NEWPATH}")
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
if(EXISTS ${MSYS_ROOT}/usr/bin/link.exe)
file(RENAME ${MSYS_ROOT}/usr/bin/link.exe ${MSYS_ROOT}/usr/bin/link.exe-renamed)
endif()
vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc -c "pacman -Sy --noconfirm --needed make"
@ -92,10 +93,6 @@ vcpkg_execute_required_process(
LOGNAME "build-${TARGET_TRIPLET}-dbg")
message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
if(EXISTS ${MSYS_ROOT}/usr/bin/link.exe-renamed)
file(RENAME ${MSYS_ROOT}/usr/bin/link.exe-renamed ${MSYS_ROOT}/usr/bin/link.exe)
endif()
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/bin
${CURRENT_PACKAGES_DIR}/debug/bin