diff options
| author | Erlang/OTP <[email protected]> | 2010-06-09 12:35:03 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-09 12:35:03 +0000 |
| commit | c073122f207e71ebc02b31138b53bfd55a28ff44 (patch) | |
| tree | ec88902a60d601f7cb43e23499370114d9fe77af /erts/etc/win32 | |
| parent | 6f06c6189a3527a1981043b09323e4233bac4ebd (diff) | |
| parent | 487ce4a4982956c0241bce7a15464d8874c26ad6 (diff) | |
| download | otp-c073122f207e71ebc02b31138b53bfd55a28ff44.tar.gz otp-c073122f207e71ebc02b31138b53bfd55a28ff44.tar.bz2 otp-c073122f207e71ebc02b31138b53bfd55a28ff44.zip | |
Merge branch 'pan/otp_8692_static_config_cache' into dev
* pan/otp_8692_static_config_cache:
Teach rc.sh to use tail -n +2 instead of tail +2
Make win32.config.cache static and copied when doing otp_build configure
Diffstat (limited to 'erts/etc/win32')
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/rc.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/rc.sh b/erts/etc/win32/cygwin_tools/vc/rc.sh index 6a6921c49e..054c672e64 100755 --- a/erts/etc/win32/cygwin_tools/vc/rc.sh +++ b/erts/etc/win32/cygwin_tools/vc/rc.sh @@ -2,20 +2,20 @@ # set -x # # %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 # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% # # Save the command line for debug outputs @@ -80,7 +80,7 @@ if [ "X$RC_SH_DEBUG_LOG" != "X" ]; then fi eval $RCC "$CMD" >/tmp/rc.exe.${p}.1 2>/tmp/rc.exe.${p}.2 RES=$? -tail +2 /tmp/rc.exe.${p}.2 >&2 +tail -n +2 /tmp/rc.exe.${p}.2 >&2 cat /tmp/rc.exe.${p}.1 rm -f /tmp/rc.exe.${p}.2 /tmp/rc.exe.${p}.1 exit $RES |