X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mk%2Fjam%2Fjamcompatibility.jam;h=72f2fec47e72e0d3bf9a89e91f88e5f9db83e21b;hb=8f027528fa72638daf160e2cd7cf3d1e9bdd5b9e;hp=9cd0ce1a48c4867d37978efa5ed04eda77bfc359;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git diff --git a/mk/jam/jamcompatibility.jam b/mk/jam/jamcompatibility.jam index 9cd0ce1a4..72f2fec47 100644 --- a/mk/jam/jamcompatibility.jam +++ b/mk/jam/jamcompatibility.jam @@ -18,9 +18,11 @@ if $(ARGV[0]) } } -if $(JAMVERSION) < 2.4 +# we can't use boostjam at the moment as it still has the bug from jam 2.4 where +# settings variables on header targets doesn't work +if $(JAMVERSION) <= 2.4 { - EXIT "Error: This buildsystem requires jam version 2.4 or later." ; + EXIT "Error: This buildsystem requires jam version 2.5 or later." ; } # don't confuse users for now... #if $(JAMVERSION) = 2.4 & $(JAM_DEBUG) @@ -220,7 +222,6 @@ rule SubDir # directory should not hold object files, LOCATE_TARGET can # subsequently be redefined. -#echo SS: $(SUBDIR) ; SEARCH_SOURCE = $(SUBDIR) ; LOCATE_SOURCE = $(ALL_LOCATE_TARGET) $(SUBDIR) ; LOCATE_TARGET = $(ALL_LOCATE_TARGET) $(SUBDIR) ;