diff options
| author | Patrik Nyblom <[email protected]> | 2011-06-14 15:34:02 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:21:10 +0100 |
| commit | 42da126259f2b9d34e2591e798bcac893cbb145d (patch) | |
| tree | 32a0b47cd9503d990cf087d6b83708764680db68 /erts/etc/win32/msys_tools | |
| parent | f2fce18b897189a60c518017704bf3b100451a93 (diff) | |
| download | otp-42da126259f2b9d34e2591e798bcac893cbb145d.tar.gz otp-42da126259f2b9d34e2591e798bcac893cbb145d.tar.bz2 otp-42da126259f2b9d34e2591e798bcac893cbb145d.zip | |
Make whole of OTP build and release on Win64
Removed symbolic links from repository.
Diffstat (limited to 'erts/etc/win32/msys_tools')
| -rw-r--r-- | erts/etc/win32/msys_tools/erl | 12 | ||||
| -rw-r--r-- | erts/etc/win32/msys_tools/vc/cc.sh | 3 | ||||
| -rw-r--r-- | erts/etc/win32/msys_tools/vc/ld.sh | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/erts/etc/win32/msys_tools/erl b/erts/etc/win32/msys_tools/erl index 576825c4be..cf49c33229 100644 --- a/erts/etc/win32/msys_tools/erl +++ b/erts/etc/win32/msys_tools/erl @@ -27,22 +27,16 @@ for x in "$@"; do -I/*|-o/*) y=`echo $x | sed 's,^-[Io]\(/.*\),\1,g'`; z=`echo $x | sed 's,^-\([Io]\)\(/.*\),\1,g'`; - #echo "Foooo:$z" - MPATH=`cygpath -m $y`; + MPATH=`msys2win_path.sh -m $y`; CMD="$CMD -$z\"$MPATH\"";; /*) - #echo "absolute:"$x; - MPATH=`cygpath -m $x`; + MPATH=`msys2win_path.sh -m $x`; CMD="$CMD \"$MPATH\"";; -# +{*);; *) -# y=`echo $x | sed 's,",\\\\\\\\\\\",g'`; y=`echo $x | sed 's,",\\\",g'`; CMD="$CMD \"$y\"";; esac done -#echo "$@" -#eval echo erlc.exe $CMD -ERL_TOP=`cygpath -m $ERL_TOP` +ERL_TOP=`msys2win_path.sh -m $ERL_TOP` export ERL_TOP eval erl.exe $CMD diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh index 6c1b20a003..3250ce158f 100644 --- a/erts/etc/win32/msys_tools/vc/cc.sh +++ b/erts/etc/win32/msys_tools/vc/cc.sh @@ -152,6 +152,9 @@ while test -n "$1" ; do -EH*) y=`echo $x | sed 's,",\\\",g'`; CMD="$CMD $y";; + -TP|-Tp) + y=`echo $x | sed 's,",\\\",g'`; + CMD="$CMD $y";; -l*) y=`echo $x | sed 's,^-l\(.*\),\1,g'`; LINKCMD="$LINKCMD $x";; diff --git a/erts/etc/win32/msys_tools/vc/ld.sh b/erts/etc/win32/msys_tools/vc/ld.sh index aa44a65912..9ed841f8fe 100644 --- a/erts/etc/win32/msys_tools/vc/ld.sh +++ b/erts/etc/win32/msys_tools/vc/ld.sh @@ -170,8 +170,8 @@ RES=$? CMANIFEST=`win2msys_path.sh $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 + sed -n -i '1h;1!H;${;g;s,<trustInfo.*</trustInfo>.,,g;p;}' $CMANIFEST 2>/dev/null + 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 2>/dev/null eval mt.exe -nologo -manifest "$MANIFEST" -outputresource:"$OUTPUTRES" >>/tmp/link.exe.${p}.1 2>>/tmp/link.exe.${p}.2 RES=$? |