diff options
| author | Patrik Nyblom <[email protected]> | 2010-08-30 14:32:47 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-08-30 14:32:47 +0200 |
| commit | 6dd774dca98cf408c091d8fd9636df6af2f204f1 (patch) | |
| tree | 9e9517f427f899d4869e89a903c40331fbde6068 /erts | |
| parent | be798f416bcab08df788101be486e8f33cd62320 (diff) | |
| parent | 57fb67b4a54ba3943efd3784433b01f9fa341747 (diff) | |
| download | otp-6dd774dca98cf408c091d8fd9636df6af2f204f1.tar.gz otp-6dd774dca98cf408c091d8fd9636df6af2f204f1.tar.bz2 otp-6dd774dca98cf408c091d8fd9636df6af2f204f1.zip | |
Merge branch 'sverker/win-virtualization-off/OTP-7405' into dev
* sverker/win-virtualization-off/OTP-7405:
Teach XP to ignore virtualization part of manifest
Turn off windows "virtualiztion"
Diffstat (limited to 'erts')
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/ld.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh index ac39bf871c..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 @@ -167,6 +167,9 @@ eval link.exe "$CMD" >/tmp/link.exe.${p}.1 2>/tmp/link.exe.${p}.2 RES=$? CMANIFEST=`cygpath $MANIFEST` if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then + # Add stuff to manifest to turn off "virtualization" + 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=$? if [ "$RES" != "0" ]; then |