diff options
| author | Negreanu Marius Adrian <[email protected]> | 2012-09-28 17:36:40 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-10-02 08:14:34 +0300 |
| commit | e00abb00f058f7476d21ee4be74df59a3a9782b9 (patch) | |
| tree | 6e62a66d659ca0ca6429ff6acef08705e060fe46 /src/glsl/Android.gen.mk | |
| parent | 523c01524638b3d1bb363f4c0a647b0777840b7a (diff) | |
android: glcpp: fix abuse of yylex
Port the 'glcpp: fix abuse of yylex' commit to Android.mk
Also, since the Android.*.mk are sourced in a global namespace,
the local-y-to-c-and-h is prefixed with the LOCAL_MODULE name,
The initial fix commit is 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a
There's also a bugzilla for this: 54947
Signed-off-by: Negreanu Marius Adrian <[email protected]>
Reviewed-by: Oliver McFadden <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/glsl/Android.gen.mk')
| -rw-r--r-- | src/glsl/Android.gen.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk index e4ccb7291ef..2ed9fa64bac 100644 --- a/src/glsl/Android.gen.mk +++ b/src/glsl/Android.gen.mk @@ -52,10 +52,10 @@ define local-l-or-ll-to-c-or-cpp $(hide) $(LEX) --nounistd -o$@ $< endef -define local-y-to-c-and-h +define glsl_local-y-to-c-and-h @mkdir -p $(dir $@) @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ $< + $(hide) $(YACC) -o $@ -p "glcpp_parser_" $< endef define local-yy-to-cpp-and-h @@ -80,7 +80,7 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(call local-l-or-ll-to-c-or-cpp) $(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y - $(call local-y-to-c-and-h) + $(call glsl_local-y-to-c-and-h) BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX) |