diff options
| author | Dan Gudmundsson <[email protected]> | 2010-11-15 10:07:30 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-15 10:07:30 +0100 |
| commit | b48be79573171e530d97cdf078488eb66fc23f30 (patch) | |
| tree | 3b7da1fa6613b426c1247c9540795970f0f8fad4 /erts | |
| parent | 49f6d49d77adb123800f5ff7b7726a8aecb3a87c (diff) | |
| parent | b5eac4ab9a7b63d90533e48531a025a99d45595f (diff) | |
| download | otp-b48be79573171e530d97cdf078488eb66fc23f30.tar.gz otp-b48be79573171e530d97cdf078488eb66fc23f30.tar.bz2 otp-b48be79573171e530d97cdf078488eb66fc23f30.zip | |
Merge branch 'dgud/erts/windows-vs10-express' into dev
* dgud/erts/windows-vs10-express:
Fix manifest files
Diffstat (limited to 'erts')
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/ld.sh | 1 |
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 d3b53eb5bc..9a38c10748 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 |