X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=mk%2Fjam%2Fflags.jam;h=13641364cd3b5b0ee25cd044d3b5c12b5b067eec;hb=902c56177611c46af0dc44d946bc73a198a03c9d;hp=5c9150c2e0dd420c9a6f8979650554a1b3062ddb;hpb=da2a51a138aaa81560c6541b411aa3086ad21bca;p=supertux.git diff --git a/mk/jam/flags.jam b/mk/jam/flags.jam index 5c9150c2e..13641364c 100644 --- a/mk/jam/flags.jam +++ b/mk/jam/flags.jam @@ -48,48 +48,6 @@ rule LinkWith } } -rule LinkWithWholeArchive -{ - local i libs sharedlib ; - - for i in $(>) { - if $($(i)_TYPE) = "library" { - if [ IsElem shared : $($(i)_OPTIONS) ] { - libs += $(i) ; - sharedlib = true ; - } else { - # for non shared libs add inherit the compile flags and libs - libs += $(i) $($(i)_LIBRARIES) ; - # inherit the exported flags - CppFlags $(<) : $($(i)_CPPFLAGS) : $(3) ; - CFlags $(<) : $($(i)_CFLAGS) : $(3) ; - C++Flags $(<) : $($(i)_CXXFLAGS) : $(3) ; - LFlags $(<) : $($(i)_LIBS) : $(3) ; - } - } else { - echo "WARNING: Trying to link" $(i) - "with" $(<) "which is not a library." ; - } - } - # resolve library dependencies - libs = [ RemoveDups $(libs) ] ; - $(<)_LIBRARIES = $(libs) ; - - local libfiles ; - for i in $(libs) { - libfiles += $($(i)_TARGET) ; - } - - DEPENDS $($(<)_TARGET) : $(libfiles) ; - NEEDLIBS_WHOLE on $($(<)_TARGET) += $(libfiles) ; - $(<)_WHOLE_ARCHIVE = true ; - # the usual libtool hack... - if $(sharedlib) { - LINK on $($(<)_TARGET) = "$(LIBTOOL) $(LINK)" ; - INSTALL on $($(<)_INSTALLTARGET) = "$(LIBTOOL) --mode=install $(INSTALL)" ; - } -} - rule CppFlags { CPPFLAGS on $($(<)_OBJECTS) += $(>) ;