summaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-20 22:21:14 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-20 22:21:14 +0100
commitd34b63780eaf80ba71279360dc1e2fdbdc488eec (patch)
treeddce6db8af04aa9d88b5728d95ef6f4fb7508311 /edify
parentMerge "kill HAVE_FORKEXEC" (diff)
parentGlobal C++11 compatibility. (diff)
downloadandroid_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.tar
android_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.tar.gz
android_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.tar.bz2
android_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.tar.lz
android_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.tar.xz
android_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.tar.zst
android_bootable_recovery-d34b63780eaf80ba71279360dc1e2fdbdc488eec.zip
Diffstat (limited to 'edify')
-rw-r--r--edify/Android.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/edify/Android.mk b/edify/Android.mk
index 61ed6fa17..03c04e432 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -7,9 +7,10 @@ edify_src_files := \
parser.y \
expr.c
-# "-x c" forces the lex/yacc files to be compiled as c;
-# the build system otherwise forces them to be c++.
-edify_cflags := -x c
+# "-x c" forces the lex/yacc files to be compiled as c the build system
+# otherwise forces them to be c++. Need to also add an explicit -std because the
+# build system will soon default C++ to -std=c++11.
+edify_cflags := -x c -std=gnu89
#
# Build the host-side command line tool