diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-20 10:38:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-20 10:45:30 +0300 |
| commit | fcf6c0a19f1a8cdff34e95ca0787277399a82c3c (patch) | |
| tree | 33fc50c5e883f16b1306790d01482102dea8c163 /filter | |
| parent | Use "python" as (build-time) gb_PYTHON if run-time Python usage is disabled (diff) | |
| download | core-fcf6c0a19f1a8cdff34e95ca0787277399a82c3c.tar.gz core-fcf6c0a19f1a8cdff34e95ca0787277399a82c3c.zip | |
I don't think we need to check CROSS_COMPILING here?
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index cce015984df8..5143d74e5f55 100644 --- 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 |