diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 09:00:46 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-20 13:17:35 -0800 |
| commit | 32f9fe7fab642378767318d971d7bcc7df47dab9 (patch) | |
| tree | ddce6db8af04aa9d88b5728d95ef6f4fb7508311 /edify | |
| parent | 92242c704846f28932e555dba800f4a701063896 (diff) | |
| download | bootable_recovery-32f9fe7fab642378767318d971d7bcc7df47dab9.zip bootable_recovery-32f9fe7fab642378767318d971d7bcc7df47dab9.tar.gz bootable_recovery-32f9fe7fab642378767318d971d7bcc7df47dab9.tar.bz2 | |
Global C++11 compatibility.
Our build system compiles flex/bison as C++ rather than C, but a few
projects add `-x c` to their flags, forcing the compiler to compile
them as C. This causes the compiler to reject the global C++ standard
flag, so we need to explicitly provide a C standard flag to override
it.
Bug: 18466763
Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
Diffstat (limited to 'edify')
| -rw-r--r-- | edify/Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/edify/Android.mk b/edify/Android.mk index 61ed6fa..03c04e4 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 |