diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-25 14:33:27 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-04-25 14:33:27 -0700 |
| commit | 3a2e300ddef8b046136a931d632c0671fa1c930f (patch) | |
| tree | e3f9b16a7405c7f71ca70b57a2bd235cb1f74701 | |
| parent | e06531cb423e22775a3f42fbf5d80282f10c43ed (diff) | |
| download | mclinker-3a2e300ddef8b046136a931d632c0671fa1c930f.tar.gz | |
Fix build break caused by MCLinker rebase.
Conflicts:
lib/Script/Android.mk
Change-Id: If03a9d3d75d6a17cbe7ec7a70d6585146c5edbe6
| -rw-r--r-- | lib/Script/ScriptParser.yy | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Script/ScriptParser.yy b/lib/Script/ScriptParser.yy index fc3e667..745a4ef 100644 --- a/lib/Script/ScriptParser.yy +++ b/lib/Script/ScriptParser.yy @@ -38,7 +38,11 @@ using namespace mcld; %require "2.4" %skeleton "glr.cc" +/* + * BEGIN android-removed: prevent bison from generating the header in current directory %defines "ScriptParser.h" + * END android-removed + */ %debug %error-verbose %define namespace "mcld" |