Skip to content

C
core
Kaydet (Commit) fcf6c0a1 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

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

üst 58be0d54
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
filter/Configuration_filter.mk
Dosyayı görüntüle @ fcf6c0a1
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# possibilities for Java as FOR_BUILD variants # possibilities for Java as FOR_BUILD variants
# this if is supposed to be an AND # 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_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET) filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
else # SOLAR_JAVA else # SOLAR_JAVA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment