remove comment obsoleted by fcf6c0a19f1a8cdff34e95ca0787277399a82c3c
This commit is contained in:
parent
e57d4e3c83
commit
6659c12d12
@ -22,12 +22,6 @@
|
|||||||
# most of the rules here use some weird merge program, and this is sort of
|
# most of the rules here use some weird merge program, and this is sort of
|
||||||
# semi-integrated with the stuff from Configuration.mk; not exactly pretty...
|
# semi-integrated with the stuff from Configuration.mk; not exactly pretty...
|
||||||
|
|
||||||
# comment from commit c9e3885ea7c950b4784b01ab0f42e92824a779c0:
|
|
||||||
# Just assume cross-compiling from a sane system with a sane java
|
|
||||||
# command... Too bored now to start propagating all the crazy
|
|
||||||
# possibilities for Java as FOR_BUILD variants
|
|
||||||
|
|
||||||
# this if is supposed to be an AND
|
|
||||||
ifeq ($(SOLAR_JAVA),)
|
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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user