I don't think we need to check CROSS_COMPILING here?

fcf6c0a1 · Tor Lillqvist · 58be0d54 · fcf6c0a1
Kaydet (Commit) fcf6c0a1 authored Eyl 20, 2011 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Configuration_filter.mk filter/Configuration_filter.mk +1 -1

No files found.
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -28,7 +28,7 @@
 # possibilities for Java as FOR_BUILD variants

 # this if is supposed to be an AND
-ifeq ($(SOLAR_JAVA)$(CROSS_COMPILING),)
+ifeq ($(SOLAR_JAVA),)
 filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
 filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
 else # SOLAR_JAVA