diff --git a/v1/darwin-tools.jam b/v1/darwin-tools.jam index 59fd1ce00..365addbab 100644 --- a/v1/darwin-tools.jam +++ b/v1/darwin-tools.jam @@ -124,7 +124,7 @@ flags darwin CFLAGS off : -w ; flags darwin LINK_FORMAT $(SHARED_TYPES)/bundle : bundle ; flags darwin LINK_FORMAT $(SHARED_TYPES)/dynamic : dynamic ; -if $(BUNDLE_LOADER) +if $(BUNDLE_LOADER) && ! $(LINK_FORMAT) { flags darwin LINK_FORMAT $(SHARED_TYPES) : bundle ; } @@ -147,7 +147,7 @@ rule Link-action { _ on $(<) = " " ; DEPENDS $(<) : $(NEEDLIBS) $(NEEDIMPS) ; - if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && $(LINK_FORMAT) != bundle + if $(TARGET_TYPE) in $(SHARED_TYPES) && $(LINK_FORMAT) != bundle { DLLFLAGS on $(<) = ; #~ DLLFLAGS on $(<) =