diff options
| author | Chad Versace <[email protected]> | 2012-12-05 21:34:26 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-12-05 23:06:16 -0800 |
| commit | 45a01cba907f3d260b14b79285449eb81cc02285 (patch) | |
| tree | f359025cdee7c5c7d124f63f1a85ee317aad3bc7 /src | |
| parent | 77b26564c3f0395bf3e744abbf6d0e7aa9d2c8da (diff) | |
android: Fix build of libmesa_program
Commit 4097308 fixed the build in a questionable way. It worked at the
time, but, as Ian pointed out, the fix would likely fail at a future
commit due to the indeterminism of parallel builds. And that's exactly
what happened; the fix no longer works. `mm -j4` on Fedora 17 fails for
me.
The problem is that there is no rule for program_parse.tab.h. To fix that,
this patch adds a rule that makes program_parse.tab.c depend on
program_parse.tab.h. Technically, the c file does not depend on the
h file. However, because the two files are generated together by a single
invocation of Bison, any rule that forces execution of Bison is
sufficient.
Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/program/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index 712506129fd..51362e0ebb7 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -65,6 +65,9 @@ LOCAL_GENERATED_SOURCES := \ $(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y $(mesa_local-y-to-c-and-h) +$(intermediates)/program/program_parse.tab.h: $(intermediates)/program/program_parse.tab.c + @ + $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l $(local-l-to-c) |