aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2010-11-12 16:21:13 +0100
committerDan Gudmundsson <[email protected]>2010-11-12 16:21:13 +0100
commitb5eac4ab9a7b63d90533e48531a025a99d45595f (patch)
tree9b0289f945f7280d24fcd452471f1c3def14a977 /erts
parentf26528bbea0a24674e797a58b97117c1f8cf163f (diff)
downloadotp-b5eac4ab9a7b63d90533e48531a025a99d45595f.tar.gz
otp-b5eac4ab9a7b63d90533e48531a025a99d45595f.tar.bz2
otp-b5eac4ab9a7b63d90533e48531a025a99d45595f.zip
Fix manifest files
It seems windows have updated manifest files in VS2010 which caused the erlang programs to contain duplicate requestedExecutionLevel entries, which is not allowed. This patch removes the microsoft entry, before adding our own which is known to work with XP and Vista.
Diffstat (limited to 'erts')
-rwxr-xr-xerts/etc/win32/cygwin_tools/vc/ld.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh
index b04935ed9b..060777f4fb 100755
--- a/erts/etc/win32/cygwin_tools/vc/ld.sh
+++ b/erts/etc/win32/cygwin_tools/vc/ld.sh
@@ -168,6 +168,7 @@ RES=$?
CMANIFEST=`cygpath $MANIFEST`
if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
# Add stuff to manifest to turn off "virtualization"
+ sed -n -i '1h;1!H;${;g;s,<trustInfo.*</trustInfo>.,,g;p;}' $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