summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNegreanu Marius Adrian <adrian.m.negreanu@intel.com>2012-09-28 17:36:40 +0300
committerOliver McFadden <oliver.mcfadden@linux.intel.com>2012-10-02 08:14:34 +0300
commite00abb00f058f7476d21ee4be74df59a3a9782b9 (patch)
tree6e62a66d659ca0ca6429ff6acef08705e060fe46 /src
parent523c01524638b3d1bb363f4c0a647b0777840b7a (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 <adrian.m.negreanu@intel.com> Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/glsl/Android.gen.mk6
-rw-r--r--src/mesa/Android.gen.mk6
2 files changed, 6 insertions, 6 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)
diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk
index f5e63234a29..c17df1a1e86 100644
--- a/src/mesa/Android.gen.mk
+++ b/src/mesa/Android.gen.mk
@@ -75,10 +75,10 @@ define local-l-to-c
$(hide) $(LEX) -o$@ $<
endef
-define local-y-to-c-and-h
+define mesa_local-y-to-c-and-h
@mkdir -p $(dir $@)
@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
- $(hide) $(YACC) -o $@ $<
+ $(hide) $(YACC) -o $@ -p "_mesa_program_" $<
endef
define es-gen
@@ -104,7 +104,7 @@ $(intermediates)/main/api_exec_%_remap_helper.h: $(es_hdr_deps)
$(call es-gen, -c $*)
$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y
- $(local-y-to-c-and-h)
+ $(mesa_local-y-to-c-and-h)
$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l
$(local-l-to-c)