summaryrefslogtreecommitdiff
path: root/compile
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-06-10 15:47:49 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-10 15:47:49 -0700
commitdf3dc85d2ff9d18f15ff7a217a1ed52a3eb7b6bf (patch)
tree478f3db238be7e08885ac80ac8ef1be9935441bb /compile
parent4813fb533a80d139fb8139369cd6c25947d1017d (diff)
parent54ca51b2ee6da088d5eb1c7ef6430b1c83019977 (diff)
Merge "Merge tag 'v1.6.37' into HEAD" am: 7794b22253 am: aa0ce810a6 am: 490afb6c02
am: 54ca51b2ee Change-Id: Ie28ab673ec855738e26ca3ba06a061856ca07045
Diffstat (limited to 'compile')
-rwxr-xr-xcompile13
1 files changed, 7 insertions, 6 deletions
diff --git a/compile b/compile
index a85b723c7..99e50524b 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End: