aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/win32/cygwin_tools
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-07-23 19:44:11 +0200
committerPatrik Nyblom <[email protected]>2010-07-23 19:57:22 +0200
commit57fb67b4a54ba3943efd3784433b01f9fa341747 (patch)
treee37b2821debaf0a06428a50a22b545a16c547db8 /erts/etc/win32/cygwin_tools
parent9b265043d77afd93e95e23e5edda6ccc1085cef0 (diff)
downloadotp-57fb67b4a54ba3943efd3784433b01f9fa341747.tar.gz
otp-57fb67b4a54ba3943efd3784433b01f9fa341747.tar.bz2
otp-57fb67b4a54ba3943efd3784433b01f9fa341747.zip
Teach XP to ignore virtualization part of manifest
ld.sh built files not executable on XP, as parts of the manifest were incomprehensible for XP machines.
Diffstat (limited to 'erts/etc/win32/cygwin_tools')
-rwxr-xr-xerts/etc/win32/cygwin_tools/vc/ld.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh
index 4fa3312286..b04935ed9b 100755
--- a/erts/etc/win32/cygwin_tools/vc/ld.sh
+++ b/erts/etc/win32/cygwin_tools/vc/ld.sh
@@ -3,7 +3,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2010. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -168,7 +168,7 @@ RES=$?
CMANIFEST=`cygpath $MANIFEST`
if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
# Add stuff to manifest to turn off "virtualization"
- sed -i "s/<\/assembly>/ <trustInfo>\n <security>\n <requestedPrivileges>\n <requestedExecutionLevel level=\"AsInvoker\" uiAccess=\"false\"\/>\n <\/requestedPrivileges>\n <\/security>\n <\/trustInfo>\n<\/assembly>/" $CMANIFEST
+ sed -i "s/<\/assembly>/ <ms_asmv2:trustInfo xmlns:ms_asmv2=\"urn:schemas-microsoft-com:asm.v2\">\n <ms_asmv2:security>\n <ms_asmv2:requestedPrivileges>\n <ms_asmv2:requestedExecutionLevel level=\"AsInvoker\" uiAccess=\"false\"\/>\n <\/ms_asmv2:requestedPrivileges>\n <\/ms_asmv2:security>\n <\/ms_asmv2:trustInfo>\n<\/assembly>/" $CMANIFEST
eval mt.exe -nologo -manifest "$MANIFEST" -outputresource:"$OUTPUTRES" >>/tmp/link.exe.${p}.1 2>>/tmp/link.exe.${p}.2
RES=$?