Use libstdc++, libsupc++ and libgcc from gcc_syslibs.

* Instead of faking libstdc++.so from libstdc++.a, use libstdc++.so
  from the gcc_syslibs build feature for everything except x86_gcc2.
* Use libgcc_s.so from the gcc_syslibs build feature for everything but
  x86_gcc2 (which still carries libgcc as part of libroot.so).
* Drop filtering of libgcc objects for libroot, as that is no longer
  necessary since we're only using libgcc-as-single-object for libroot
  with x86_gcc2, where the filtered object file doesn't exist. Should
  the objects that used to be filtered cause any problems as part of
  libgcc_s.so, we can always filter them as part of the gcc build.
* Use libsupc++.so from the gcc_syslibs build feature for everything but
  x86_gcc2.
* Adjust all Jamfiles accordingly.
* Deactivate building of faked libstdc++.so for non-x86-gcc2. For
  x86_gcc2, we still build libstdc++.so from the sources in the Haiku
  source tree as part of the Haiku build .
* Put gcc_syslibs package onto the image, when needed.

Jamfile

@@ -30,9 +30,14 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
 		mesa mesa_devel mesa_swrast sed sharutils tar tiff wget which
 	}@
 ] ;
-# secondary architectures
+if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {
-local architectureObject ;
+	AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs ] ;
-for architectureObject
+}
+
+if $(HAIKU_PACKAGING_ARCHS[2]) {
+	# secondary architectures
+	local architectureObject ;
+	for architectureObject
 			in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
 		on $(architectureObject) {
 			AddHaikuImagePackages [ FFilterByBuildFeatures
@@ -42,6 +47,10 @@ for architectureObject
 					ffmpeg glu jpeg libpng mesa
 				}@
 			] ;
+			if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
+				AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs ] ;
+			}
+		}
 	}
 }
 

build/jam/ArchitectureRules

@@ -466,8 +466,7 @@ rule KernelArchitectureSetup architecture
 	# kernel add-on glue code
 	HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = <$(architecture)>crtbeginS.o
 		<src!system!glue!$(architecture)>haiku_version_glue.o ;
-	HAIKU_KERNEL_ADDON_END_GLUE_CODE
+	HAIKU_KERNEL_ADDON_END_GLUE_CODE = <$(architecture)>crtendS.o ;
-		= $(HAIKU_GCC_LIBGCC_$(architecture)) <$(architecture)>crtendS.o ;
 }
 
 

build/jam/BootRules

@@ -54,9 +54,11 @@ rule BootLd
 	# libsupc++ is opt-out.
 	local libs ;
 	if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] {
-		libs += $(TARGET_BOOT_LIBSUPC++) ;
+		libs += [ TargetBootLibsupc++ true ] ;
+		Depends $(1) : [ TargetBootLibsupc++ ] ;
 	}
-	LINKLIBS on $(1) =  $(libs) $(TARGET_BOOT_LIBGCC) ;
+	LINKLIBS on $(1) =  $(libs) [ TargetBootLibgcc true ] ;
+	Depends $(1) : [ TargetBootLibgcc ] ;
 
 	# TODO: Do we really want to invoke SetupBoot here? The objects should
 	# have been compiled with BootObjects anyway, so we're doing that twice.

build/jam/KernelRules

@@ -48,9 +48,11 @@ rule KernelLd
 	# libsupc++ is opt-out.
 	local libs ;
 	if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] {
-		libs += $(TARGET_KERNEL_LIBSUPC++) ;
+		libs += [ TargetKernelLibsupc++ true ] ;
+		Depends $(1) : [ TargetKernelLibsupc++ ] ;
 	}
-	LINKLIBS on $(1) =  $(libs) $(TARGET_KERNEL_LIBGCC) ;
+	LINKLIBS on $(1) =  $(libs) [ TargetKernelLibgcc true ] ;
+	Depends $(1) : [ TargetKernelLibgcc ] ;
 
 	HAIKU_TARGET_IS_EXECUTABLE on $(1) = 1 ;
 
@@ -119,7 +121,8 @@ rule KernelAddon
 		if $(PLATFORM) = haiku {
 			kernel = <nogrist>kernel.so ;
 			beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ;
-			endGlue = $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ;
+			endGlue
+				= [ TargetKernelLibgcc ] $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ;
 		} else if $(PLATFORM) = haiku_host {
 			kernel = /boot/develop/lib/x86/kernel.so ;
 			beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ;

build/jam/MainBuildRules

@@ -8,7 +8,8 @@ rule AddSharedObjectGlueCode
 	on $(1) {
 		platform = $(PLATFORM) ;
 		if $(platform) = haiku {
-			local stdLibs = [ MultiArchDefaultGristFiles libroot.so ] ;
+			local stdLibs = [ MultiArchDefaultGristFiles libroot.so ]
+				[ TargetLibgcc ] ;
 			local type = EXECUTABLE ;
 			if $(2) != true {
 				type = LIBRARY ;

build/jam/images/definitions/minimum

@@ -89,8 +89,7 @@ rule HaikuImageGetSystemLibs
 	return
 		# libs with special grist
 		[ MultiArchDefaultGristFiles libroot.so : revisioned ]
-		$(HAIKU_SHARED_LIBSTDC++_$(TARGET_PACKAGING_ARCH))
+		[ Libstdc++ForImage ]
-		$(HAIKU_SHARED_LIBSUPC++_$(TARGET_PACKAGING_ARCH))
 		# libs with standard grist
 		[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
 			libbe.so libbsd.so libbnetapi.so

build/jam/images/definitions/regular

@@ -62,8 +62,7 @@ rule HaikuImageGetSystemLibs
 	return
 		# libs with special grist
 		[ MultiArchDefaultGristFiles libroot.so : revisioned ]
-		$(HAIKU_SHARED_LIBSTDC++_$(TARGET_PACKAGING_ARCH))
+		[ Libstdc++ForImage ]
-		$(HAIKU_SHARED_LIBSUPC++_$(TARGET_PACKAGING_ARCH))
 		# libs with standard grist
 		[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
 			libalm.so

build/jam/packages/HaikuCrossDevel

@@ -48,8 +48,8 @@ for stage in _stage1 "" {
 		[ MultiArchDefaultGristFiles libbsd.so ]
 		[ MultiArchDefaultGristFiles libroot.so : revisioned ]
 		[ MultiArchDefaultGristFiles libnetwork.so ]
-		$(HAIKU_SHARED_LIBSTDC++_$(architecture))
+		[ TargetLibstdc++ ]
-		$(HAIKU_SHARED_LIBSUPC++_$(architecture))
+		[ TargetLibsupc++ ]
 		$(additionalLibraries$(stage))
 		;
 

src/add-ons/accelerants/radeon_hd/Jamfile

@@ -24,5 +24,5 @@ Addon radeon_hd.accelerant :
 	mode.cpp
 	pll.cpp
 	ringqueue.cpp
-	: be libaccelerantscommon.a $(TARGET_LIBSUPC++)
+	: be libaccelerantscommon.a [ TargetLibsupc++ ]
 ;

src/add-ons/decorators/BeDecorator/Jamfile

@@ -17,5 +17,5 @@ Includes [ FGristFiles BeDecorator.cpp ]
 
 Addon BeDecorator :
 	BeDecorator.cpp
-	: be <nogrist>app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
+	: be <nogrist>app_server [ TargetLibstdc++ ] [ TargetLibsupc++ ]
 ;

src/add-ons/decorators/MacDecorator/Jamfile

@@ -17,5 +17,5 @@ Includes [ FGristFiles MacDecorator.cpp ]
 
 Addon MacDecorator :
 	MacDecorator.cpp
-	: be <nogrist>app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
+	: be <nogrist>app_server [ TargetLibstdc++ ] [ TargetLibsupc++ ]
 ;

src/add-ons/decorators/WinDecorator/Jamfile

@@ -17,5 +17,5 @@ Includes [ FGristFiles WinDecorator.cpp ]
 
 Addon WinDecorator :
 	WinDecorator.cpp
-	: be <nogrist>app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
+	: be <nogrist>app_server [ TargetLibstdc++ ] [ TargetLibsupc++ ]
 ;

src/add-ons/disk_systems/bfs/Jamfile

@@ -13,7 +13,7 @@ Addon <disk_system>bfs :
 
 	bfs_disk_system.cpp
 
-	: be localestub $(TARGET_LIBSUPC++) libshared.a
+	: be localestub [ TargetLibsupc++ ] libshared.a
 ;
 
 DoCatalogs <disk_system>bfs :

src/add-ons/disk_systems/gpt/Jamfile

@@ -18,5 +18,5 @@ Addon <disk_system>gpt :
 	crc32.cpp
 	utility.cpp
 
-	: be $(TARGET_LIBSUPC++)
+	: be [ TargetLibsupc++ ]
 ;

src/add-ons/disk_systems/intel/Jamfile

@@ -23,7 +23,7 @@ Addon <disk_system>intel :
 	# kernel sources
 	PartitionMap.cpp
 
-	: be libshared.a localestub $(TARGET_LIBSUPC++)
+	: be libshared.a localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs <disk_system>intel :

src/add-ons/disk_systems/ntfs/Jamfile

@@ -11,7 +11,7 @@ Addon <disk_system>ntfs :
 	NTFSAddOn.cpp
 	InitializeParameterEditor.cpp
 
-	: be localestub $(TARGET_LIBSUPC++) libshared.a
+	: be localestub [ TargetLibsupc++ ] libshared.a
 ;
 
 DoCatalogs <disk_system>ntfs :

src/add-ons/index_server/audiotags/Jamfile

@@ -16,7 +16,7 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_TAGLIB_HEADERS_DEPENDENCY) ;
 Addon AudioTagAnalyser :
 	$(sources)
 	:
-	be $(HAIKU_TAGLIB_LIBS) $(TARGET_LIBSTDC++)
+	be $(HAIKU_TAGLIB_LIBS) [ TargetLibstdc++ ]
 	;
 
 SEARCH on [ FGristFiles IndexServerAddOn.cpp ]

src/add-ons/index_server/fulltext/Jamfile

@@ -17,7 +17,7 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_CLUCENE_HEADERS_DEPENDENCY) ;
 Addon FullTextAnalyser :
 	$(sources)
 	:
-	be $(HAIKU_CLUCENE_LIBS) $(TARGET_LIBSTDC++)
+	be $(HAIKU_CLUCENE_LIBS) [ TargetLibstdc++ ]
 ;
 
 SEARCH on [ FGristFiles IndexServerAddOn.cpp ]

src/add-ons/input_server/devices/keyboard/Jamfile

@@ -14,7 +14,7 @@ Addon <input>keyboard :
 	TeamMonitorWindow.cpp
 	TeamListItem.cpp
 
-	: input_server be libshared.a localestub $(TARGET_LIBSUPC++) ;
+	: input_server be libshared.a localestub [ TargetLibsupc++ ] ;
 
 DoCatalogs <input>keyboard :
 	x-vnd.Haiku-KeyboardInputServerDevice

src/add-ons/input_server/devices/mouse/Jamfile

@@ -6,4 +6,4 @@ UsePrivateHeaders input shared ;
 
 Addon <input>mouse :
 	MouseInputDevice.cpp
-	: be input_server $(TARGET_LIBSUPC++) ;
+	: be input_server [ TargetLibsupc++ ] ;

src/add-ons/input_server/devices/tablet/Jamfile

@@ -6,4 +6,4 @@ UsePrivateHeaders input ;
 
 Addon <input>tablet :
 	TabletInputDevice.cpp
-	: be input_server $(TARGET_LIBSUPC++) ;
+	: be input_server [ TargetLibsupc++ ] ;

src/add-ons/input_server/devices/wacom/Jamfile

@@ -10,4 +10,4 @@ Addon <input>wacom :
 	PointingDevice.cpp
 	PointingDeviceFactory.cpp
 	TabletDevice.cpp
-	: be input_server $(TARGET_LIBSUPC++) ;
+	: be input_server [ TargetLibsupc++ ] ;

src/add-ons/input_server/filters/screen_saver/Jamfile

@@ -6,4 +6,4 @@ UsePrivateHeaders screen_saver ;
 
 Addon screen_saver : 
 	ScreenSaverFilter.cpp 
-	: be libscreensaver.so input_server $(TARGET_LIBSUPC++) ;
+	: be libscreensaver.so input_server [ TargetLibsupc++ ] ;

src/add-ons/input_server/filters/shortcut_catcher/Jamfile

@@ -23,4 +23,4 @@ Addon shortcut_catcher :
 	CommandExecutor.cpp
 	KeyCommandMap.cpp
 	ShortcutsServerFilter.cpp
-	: be game input_server libshortcuts_shared.a $(TARGET_LIBSUPC++) ;
+	: be game input_server libshortcuts_shared.a [ TargetLibsupc++ ] ;

src/add-ons/input_server/filters/vmware_mouse/Jamfile

@@ -2,4 +2,4 @@ SubDir HAIKU_TOP src add-ons input_server filters vmware_mouse ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-Addon vmware_mouse : VMWareMouse.cpp : be input_server $(TARGET_LIBSUPC++) ;
+Addon vmware_mouse : VMWareMouse.cpp : be input_server [ TargetLibsupc++ ] ;

src/add-ons/input_server/methods/canna/Jamfile

@@ -17,7 +17,7 @@ Addon canna :
 	CannaMethod.cpp
 	KouhoWindow.cpp
 	PaletteWindow.cpp
-	: be textencoding input_server libcanna.a librk.a $(TARGET_LIBSUPC++) ;
+	: be textencoding input_server libcanna.a librk.a [ TargetLibsupc++ ] ;
 
 SubInclude HAIKU_TOP src add-ons input_server methods canna lib ;
 SubInclude HAIKU_TOP src add-ons input_server methods canna rk ;

src/add-ons/kernel/busses/virtio/Jamfile

@@ -6,6 +6,4 @@ UsePrivateHeaders kernel virtio ;
 
 KernelAddon virtio_pci :
 	virtio_pci.cpp
-
-	: $(TARGET_KERNEL_LIBSUPC++)
 ;

src/add-ons/kernel/file_systems/bindfs/Jamfile

@@ -16,7 +16,6 @@ HAIKU_BIND_FS_SOURCES =
 KernelAddon bindfs
 	:
 	$(HAIKU_BIND_FS_SOURCES)
-	: $(TARGET_KERNEL_LIBSUPC++)
 ;
 
 

src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile

@@ -20,6 +20,6 @@ Application authentication_server
 	  AuthenticationPanel.cpp
 	  AuthenticationServer.cpp
 	  Panel.cpp
-	: be $(TARGET_LIBSUPC++) libshared.a
+	: be [ TargetLibsupc++ ] libshared.a
 	: authentication_server.rdef
 ;

src/add-ons/kernel/file_systems/netfs/client/Jamfile

@@ -88,5 +88,5 @@ Addon netfs
 	  VolumeManager.cpp
 
 	: be libuserlandfs_beos_kernel.so
-	  $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+	  $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a
 ;

src/add-ons/kernel/file_systems/netfs/server/Jamfile

@@ -84,7 +84,7 @@ Application netfs_server
 	Volume.cpp
 	VolumeManager.cpp
 	:
-	be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+	be $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a
 	:
 	netfs_server.rdef
 ;

src/add-ons/kernel/file_systems/nfs4/idmapper/Jamfile

@@ -6,7 +6,7 @@ Application nfs4_idmapper_server
 
 	:
 	be
-	$(TARGET_LIBSUPC++)
+	[ TargetLibsupc++ ]
 
 	:
 	nfs4_idmapper_server.rdef

src/add-ons/kernel/file_systems/packagefs/Jamfile

@@ -129,7 +129,7 @@ KernelAddon packagefs
 	$(storageKitSources)
 	$(supportKitSources)
 
-	: $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
+	: kernel_libz.a
 ;
 
 

src/add-ons/kernel/file_systems/ramfs/Jamfile

@@ -44,6 +44,4 @@ KernelAddon ramfs
 	  SizeIndex.cpp
 	  SymLink.cpp
 	  Volume.cpp
-
-	: $(TARGET_KERNEL_LIBSUPC++)
 ;

src/add-ons/kernel/file_systems/reiserfs/Jamfile

@@ -27,6 +27,4 @@ KernelAddon reiserfs
 	Tree.cpp
 	VNode.cpp
 	Volume.cpp
-
-	: $(TARGET_KERNEL_LIBSUPC++)
 ;

src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile

@@ -40,6 +40,4 @@ KernelAddon userlandfs
 	  Settings.cpp
 	  UserlandFS.cpp
 	  Volume.cpp
-
-	: $(TARGET_KERNEL_LIBSUPC++)
 ;

src/add-ons/kernel/file_systems/userlandfs/server/Jamfile

@@ -43,7 +43,7 @@ Application userlandfs_server
 
 	:
 	be
-	$(TARGET_LIBSUPC++)
+	[ TargetLibsupc++ ]
 	:
 	userlandfs_server.rdef
 ;

src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile

@@ -27,5 +27,5 @@ SharedLibrary libuserlandfs_beos_kernel.so
 
 	:
 	<nogrist>userlandfs_server
-	$(TARGET_LIBSUPC++)
+	[ TargetLibsupc++ ]
 ;

src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile

@@ -29,5 +29,5 @@ SharedLibrary libuserlandfs_fuse.so
 	FUSEVolume.cpp
 
 	:
-	<nogrist>userlandfs_server libshared.a be $(TARGET_LIBSUPC++)
+	<nogrist>userlandfs_server libshared.a be [ TargetLibsupc++ ]
 ;

src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile

@@ -52,7 +52,7 @@ SharedLibrary libuserlandfs_haiku_kernel.so
 	:
 	<nogrist>userlandfs_server
 	be	# for BLocker only
-	$(TARGET_LIBSUPC++)
+	[ TargetLibsupc++ ]
 ;
 
 

src/add-ons/locale/catalogs/plaintext/Jamfile

@@ -5,5 +5,5 @@ UsePrivateHeaders locale shared ;
 
 Addon <catalog-addon>plaintext
 	: Catalog.cpp 
-	: be $(TARGET_LIBSTDC++)
+	: be [ TargetLibstdc++ ]
 	;

src/add-ons/locale/collators/Jamfile

@@ -12,11 +12,11 @@ Depends LocaleKitCollatorAddons
 
 Addon <collator-addon>GermanDIN-2
 	: GermanDIN-2.cpp
-	: be $(TARGET_LIBSUPC++)
+	: be [ TargetLibsupc++ ]
 	;
 
 Addon <collator-addon>French
 	: French.cpp
-	: be $(TARGET_LIBSUPC++)
+	: be [ TargetLibsupc++ ]
 	;
 

src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile

@@ -13,7 +13,7 @@ Addon MatchHeader
 	RuleFilter.cpp
 	StringMatcher.cpp
 	:
-	be libmail.so $(TARGET_LIBSUPC++) localestub
+	be libmail.so [ TargetLibsupc++ ] localestub
 	;
 
 DoCatalogs MatchHeader

src/add-ons/mail_daemon/inbound_filters/notifier/Jamfile

@@ -11,7 +11,7 @@ Addon NewMailNotification :
 	filter.cpp
 	ConfigView.cpp
 	:
-	be libmail.so localestub $(TARGET_LIBSUPC++)
+	be libmail.so localestub [ TargetLibsupc++ ]
 	;
 
 DoCatalogs NewMailNotification :

src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile

@@ -12,7 +12,7 @@ Addon SpamFilter :
 	SpamFilterConfig.cpp
 	SpamFilter.cpp
 	:
-	be libmail.so localestub $(TARGET_LIBSUPC++)
+	be libmail.so localestub [ TargetLibsupc++ ]
 	;
 
 DoCatalogs SpamFilter

src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile

@@ -43,7 +43,7 @@ Addon IMAP
 	$(sources)
 	:
 	be libmail.so localestub $(TARGET_NETWORK_LIBS) libalm.so
-		libshared.a $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++)
+		libshared.a [ TargetLibsupc++ ] [ TargetLibstdc++ ]
 ;
 
 SEARCH on [ FGristFiles IMAPFolders.cpp IMAPHandler.cpp IMAPMailbox.cpp

src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile

@@ -34,7 +34,7 @@ AddResources POP3 : POP3.rdef ;
 Addon POP3
 	: $(sources)
 	: be libbnetapi.so libmail.so localestub
-		[ BuildFeatureAttribute openssl : libraries ] $(TARGET_LIBSUPC++)
+		[ BuildFeatureAttribute openssl : libraries ] [ TargetLibsupc++ ]
 		$(TARGET_NETWORK_LIBS)
 ;
 

src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile

@@ -12,7 +12,7 @@ Addon Fortune :
 	ConfigView.cpp
 	filter.cpp
 	:
-	be libmail.so localestub $(TARGET_LIBSUPC++)
+	be libmail.so localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs Fortune :

src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile

@@ -29,7 +29,7 @@ AddResources SMTP : SMTP.rdef ;
 
 Addon SMTP
 	: $(sources)
-	: be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++)
+	: be libmail.so $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
 		localestub [ BuildFeatureAttribute openssl : libraries ]
 ;
 

src/add-ons/media/media-add-ons/dvb/Jamfile

@@ -19,7 +19,7 @@ Addon dvb.media_addon :
 	PacketQueue.cpp
 	pes.cpp
 	TransportStreamDemux.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;
 
 Includes [ FGristFiles MediaFormat.cpp ]

src/add-ons/media/media-add-ons/equalizer/Jamfile

@@ -6,5 +6,5 @@ Addon equalizer.media_addon :
 	Equalizer.cpp
 	EqualizerAddOn.cpp
 	EqualizerNode.cpp
-	: be media $(TARGET_LIBSTDC++)
+	: be media [ TargetLibstdc++ ]
 ;

src/add-ons/media/media-add-ons/esound_sink/Jamfile

@@ -10,6 +10,6 @@ Addon esound_sink.media_addon :
 	ESDEndpoint.cpp
 	ESDSinkAddOn.cpp
 	ESDSinkNode.cpp
-	: be media network $(TARGET_LIBSUPC++)
+	: be media network [ TargetLibsupc++ ]
 ;
 

src/add-ons/media/media-add-ons/firewire_dv/Jamfile

@@ -10,5 +10,5 @@ Addon firewire_dv.media_addon :
 	FireWireCard.cpp
 	FireWireDVAddOn.cpp
 	FireWireDVNode.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/legacy/Jamfile

@@ -7,5 +7,5 @@ Addon legacy.media_addon :
 	LegacyAudioDevice.cpp
 	LegacyAudioProducer.cpp
 	LegacyMediaAddOn.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/mixer/Jamfile

@@ -15,7 +15,7 @@ Addon mixer.media_addon :
 	MixerSettings.cpp
 	MixerUtils.cpp
 	Resampler.cpp
-	: be media $(TARGET_LIBSUPC++) localestub
+	: be media [ TargetLibsupc++ ] localestub
 ;
 
 DoCatalogs mixer.media_addon

src/add-ons/media/media-add-ons/multi_audio/Jamfile

@@ -17,7 +17,7 @@ Addon hmulti_audio.media_addon :
 	MultiAudioUtility.cpp
 	Resampler.cpp
 	TimeComputer.cpp
-	: be media $(TARGET_LIBSUPC++) localestub
+	: be media [ TargetLibsupc++ ] localestub
 ;
 
 DoCatalogs hmulti_audio.media_addon

src/add-ons/media/media-add-ons/opensound/Jamfile

@@ -14,5 +14,5 @@ Addon opensound.media_addon :
 	OpenSoundDeviceEngine.cpp
 	OpenSoundDeviceMixer.cpp
 	OpenSoundNode.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/reader/Jamfile

@@ -10,5 +10,5 @@ Application reader.media_addon :
 	MediaReader.cpp
 	MediaReaderAddOn.cpp
 	misc.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile

@@ -3,5 +3,5 @@ SubDir HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ;
 Addon tone_producer_demo.media_addon :
 	ToneProducerAddOn.cpp
 	ToneProducer.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/usb_vision/Jamfile

@@ -8,5 +8,5 @@ Addon usb_vision.media_addon :
 	AddOn.cpp
 	Producer.cpp
 	TunerLocale.cpp
-	: be media $(TARGET_LIBSTDC++)
+	: be media [ TargetLibstdc++ ]
 ;

src/add-ons/media/media-add-ons/usb_webcam/Jamfile

@@ -95,7 +95,7 @@ Addon usb_webcam.media_addon :
 	CamRoster.cpp
 	CamSensor.cpp
 	CamStreamingDeframer.cpp
-	: be media $(usbKitLibraryName) $(TARGET_LIBSUPC++)
+	: be media $(usbKitLibraryName) [ TargetLibsupc++ ]
 ;
 
 # force dependancies

src/add-ons/media/media-add-ons/video_producer_demo/Jamfile

@@ -3,5 +3,5 @@ SubDir HAIKU_TOP src add-ons media media-add-ons video_producer_demo ;
 Addon video_producer_demo.media_addon :
 	AddOn.cpp
 	Producer.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/videowindow/Jamfile

@@ -5,5 +5,5 @@ Addon video_window_demo.media_addon :
     VideoNode.cpp
     VideoView.cpp
     VideoWindow.cpp
-	: be media $(TARGET_LIBSUPC++)
+	: be media [ TargetLibsupc++ ]
 ;

src/add-ons/media/media-add-ons/vst_host/Jamfile

@@ -6,5 +6,5 @@ Addon vst_host.media_addon :
 	VSTHost.cpp
 	VSTAddOn.cpp
 	VSTNode.cpp
-	: be media $(TARGET_LIBSTDC++)
+	: be media [ TargetLibstdc++ ]
 ;

src/add-ons/media/plugins/ac3_decoder/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders media ;
 
 Addon ac3_decoder :
 	ac3_decoder.cpp
-	: liba52.a be libmedia.so $(TARGET_LIBSUPC++)
+	: liba52.a be libmedia.so [ TargetLibsupc++ ]
 ;
 
 SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder liba52 ;

src/add-ons/media/plugins/aiff_reader/Jamfile

@@ -6,4 +6,4 @@ UsePrivateHeaders media ;
 
 Addon aiff_reader :
 	aiff_reader.cpp
-	: be libmedia.so $(TARGET_LIBSUPC++) ;
+	: be libmedia.so [ TargetLibsupc++ ] ;

src/add-ons/media/plugins/ape_reader/Jamfile

@@ -9,7 +9,7 @@ SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ;
 
 Addon ape_reader :
 	APEReader.cpp
-	: libMonkeysAudio.a MAClib.a be libmedia.so $(TARGET_LIBSUPC++)
+	: libMonkeysAudio.a MAClib.a be libmedia.so [ TargetLibsupc++ ]
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;

src/add-ons/media/plugins/asf_reader/Jamfile

@@ -12,7 +12,7 @@ Addon asf_reader :
 	ASFIndex.cpp
 	:
 	libasfreader.a
-	be libmedia.so $(TARGET_LIBSTDC++)
+	be libmedia.so [ TargetLibstdc++ ]
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins asf_reader libasf ;

src/add-ons/media/plugins/au_reader/Jamfile

@@ -6,5 +6,5 @@ UsePrivateHeaders media ;
 
 Addon au_reader :
 	au_reader.cpp
-	: be libmedia.so $(TARGET_LIBSUPC++)
+	: be libmedia.so [ TargetLibsupc++ ]
 ;

src/add-ons/media/plugins/avi_reader/Jamfile

@@ -10,7 +10,7 @@ Addon avi_reader :
 	avi_reader.cpp
 	:
 	libopendml.a
-	be libmedia.so $(TARGET_LIBSTDC++)
+	be libmedia.so [ TargetLibstdc++ ]
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;

src/add-ons/media/plugins/ffmpeg/Jamfile

@@ -57,7 +57,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 
 			be
 			media
-			$(TARGET_LIBSUPC++)
+			[ TargetLibsupc++ ]
 		;
 	}
 }

src/add-ons/media/plugins/matroska/Jamfile

@@ -17,7 +17,7 @@ Addon matroska :
 #	libmatroska.a
 	libMatroskaParser.a
 	[ BuildFeatureAttribute zlib : library ]
-	libmedia.so be $(TARGET_LIBSTDC++)
+	libmedia.so be [ TargetLibstdc++ ]
 ;
 
 # SubInclude HAIKU_TOP src add-ons media plugins matroska libebml ;

src/add-ons/media/plugins/mov_reader/Jamfile

@@ -11,7 +11,7 @@ Addon mov_reader :
 	:
 	libmovreader.a
 	[ BuildFeatureAttribute zlib : library ]
-	be libmedia.so $(TARGET_LIBSTDC++)
+	be libmedia.so [ TargetLibstdc++ ]
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins mov_reader libMOV ;

src/add-ons/media/plugins/mp4_reader/Jamfile

@@ -11,7 +11,7 @@ Addon mp4_reader :
 	:
 	libmp4reader.a
 	[ BuildFeatureAttribute zlib : library ]
-	be libmedia.so $(TARGET_LIBSTDC++)
+	be libmedia.so [ TargetLibstdc++ ]
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins mp4_reader libMP4 ;

src/add-ons/media/plugins/musepack/Jamfile

@@ -10,7 +10,7 @@ Addon musepack :
 	MusePack.cpp
 	MusePackReader.cpp
 	MusePackDecoder.cpp
-	: libmusepack.a be libmedia.so $(TARGET_LIBSUPC++)
+	: libmusepack.a be libmedia.so [ TargetLibsupc++ ]
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins musepack mpc ;

src/add-ons/media/plugins/raw_decoder/Jamfile

@@ -10,7 +10,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		Addon [ MultiArchDefaultGristFiles raw_decoder ] :
 			AudioConversion.cpp
 			RawDecoderPlugin.cpp
-			: be media $(TARGET_LIBSUPC++)
+			: be media [ TargetLibsupc++ ]
 		;
 	}
 }

src/add-ons/media/plugins/wav_reader/Jamfile

@@ -6,5 +6,5 @@ UsePrivateHeaders media ;
 
 Addon wav_reader :
 	WavReaderPlugin.cpp
-	: be libmedia.so $(TARGET_LIBSUPC++)
+	: be libmedia.so [ TargetLibsupc++ ]
 ;

src/add-ons/print/drivers/canon_lips/lips3/Jamfile

@@ -11,5 +11,5 @@ Addon Canon\ LIPS3\ Compatible :
 	Lips3.cpp
 	Lips3Cap.cpp
 	Compress3.cpp
-	: be libprint.a $(TARGET_LIBSTDC++)
+	: be libprint.a [ TargetLibstdc++ ]
 ;

src/add-ons/print/drivers/canon_lips/lips4/Jamfile

@@ -10,5 +10,5 @@ Addon Canon\ LIPS4\ Compatible :
 	Lips4Entry.cpp
 	Lips4.cpp
 	Lips4Cap.cpp
-	: be libprint.a $(TARGET_LIBSTDC++)
+	: be libprint.a [ TargetLibstdc++ ]
 ;

src/add-ons/print/drivers/gutenprint/Jamfile

@@ -27,5 +27,5 @@ Addon Gutenprint :
 	be 
 	[ BuildFeatureAttribute gutenprint : library ]
 	libprint.a 
-	$(TARGET_LIBSTDC++)
+	[ TargetLibstdc++ ]
 ;

src/add-ons/print/drivers/pcl5/Jamfile

@@ -10,5 +10,5 @@ Addon PCL5\ Compatible :
 	PCL5Entry.cpp
 	PCL5.cpp
 	PCL5Cap.cpp
-	: be libprint.a $(TARGET_LIBSTDC++)
+	: be libprint.a [ TargetLibstdc++ ]
 ;

src/add-ons/print/drivers/pcl6/Jamfile

@@ -14,5 +14,5 @@ Addon PCL6\ Compatible :
 	PCL6Rasterizer.cpp
 	PCL6Writer.cpp
 	Rasterizer.cpp
-	: be libprint.a $(TARGET_LIBSTDC++)
+	: be libprint.a [ TargetLibstdc++ ]
 ;

src/add-ons/print/drivers/pdf/source/Jamfile

@@ -48,5 +48,5 @@ Addon PDF\ Writer :
 	libpdf.a
 	libprint.a 
 	libprintutils.a 
-	$(TARGET_LIBSUPC++)
+	[ TargetLibsupc++ ]
 ;

src/add-ons/print/drivers/postscript/Jamfile

@@ -14,5 +14,5 @@ Addon PS\ Compatible :
 	SelectPPDDlg.cpp
 	PPDParser.cpp
 	FilterIO.cpp
-	: be libprint.a $(TARGET_LIBSTDC++)
+	: be libprint.a [ TargetLibstdc++ ]
 ;

src/add-ons/print/drivers/preview/Jamfile

@@ -12,5 +12,5 @@ Addon Preview :
 	Driver.cpp
 	PrinterDriver.cpp
 	PreviewDriver.cpp
-	: be libprint.a $(TARGET_LIBSTDC++)
+	: be libprint.a [ TargetLibstdc++ ]
 ;

src/add-ons/print/transports/hp_jetdirect/Jamfile

@@ -8,5 +8,5 @@ Addon HP\ JetDirect :
 	print_transport.cpp
 	HPJetDirectTransport.cpp
 	SetupWindow.cpp
-	: be $(TARGET_NETWORK_LIBS) $(TARGET_NETAPI_LIB) $(TARGET_LIBSUPC++)
+	: be $(TARGET_NETWORK_LIBS) $(TARGET_NETAPI_LIB) [ TargetLibsupc++ ]
 ;

src/add-ons/print/transports/ipp/Jamfile

@@ -17,7 +17,7 @@ Addon IPP :
 	Socket.o
 	SocketStream.o
 	DbgMsg.o
-	: libshared.a be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++)
+	: libshared.a be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
 ;
 
 ObjectReferences

src/add-ons/print/transports/lpr/Jamfile

@@ -18,7 +18,7 @@ Addon LPR :
 	be 
 	libprint.a
 	$(TARGET_NETWORK_LIBS) 
-	$(TARGET_LIBSTDC++)
+	[ TargetLibstdc++ ]
 ;
 
 ObjectReferences

src/add-ons/print/transports/parallel_port/Jamfile

@@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ;
 Addon Parallel\ Port :
 	ParallelTransport.cpp
 	PrintTransportAddOn.cpp
-	: be $(TARGET_LIBSUPC++)
+	: be [ TargetLibsupc++ ]
 ;

src/add-ons/print/transports/print_to_file/Jamfile

@@ -8,5 +8,5 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 Addon Print\ To\ File : 
 	print_transport.cpp
 	FileSelector.cpp
-	: be tracker $(TARGET_LIBSUPC++)
+	: be tracker [ TargetLibsupc++ ]
 ;

src/add-ons/print/transports/serial_port/Jamfile

@@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ;
 Addon Serial\ Port :
 	SerialTransport.cpp
 	PrintTransportAddOn.cpp
-	: be $(TARGET_LIBSUPC++)
+	: be [ TargetLibsupc++ ]
 ;

src/add-ons/print/transports/usb_port/Jamfile

@@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ;
 Addon USB\ Port :
 	USBTransport.cpp
 	PrintTransportAddOn.cpp
-	: libshared.a libdevice.so be $(TARGET_LIBSUPC++)
+	: libshared.a libdevice.so be [ TargetLibsupc++ ]
 ;

src/add-ons/screen_savers/butterfly/Jamfile

@@ -7,7 +7,7 @@ AddResources Butterfly : Butterfly.rdef ;
 
 ScreenSaver Butterfly :
 	Butterfly.cpp
-	: be screensaver localestub $(TARGET_LIBSUPC++)
+	: be screensaver localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs Butterfly :

src/add-ons/screen_savers/debugnow/Jamfile

@@ -9,7 +9,7 @@ AddResources DebugNow : DebugNow.rdef ;
 
 ScreenSaver DebugNow :
 	DebugNow.cpp : 
-	be libscreensaver.so localestub $(TARGET_LIBSUPC++)
+	be libscreensaver.so localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs DebugNow :

src/add-ons/screen_savers/flurry/Jamfile

@@ -21,7 +21,7 @@ Includes [ FGristFiles $(sources) ] :
 
 ScreenSaver Flurry :
 	$(sources) :
-	be screensaver localestub $(TARGET_LIBSUPC++)
+	be screensaver localestub [ TargetLibsupc++ ]
 	[ BuildFeatureAttribute glu : library ]
 	[ BuildFeatureAttribute mesa : library ]
 ;

src/add-ons/screen_savers/glife/Jamfile

@@ -25,7 +25,7 @@ AddResources GLife : GLife.rdef ;
 
 ScreenSaver GLife :
 	$(sources) : 
-	be screensaver localestub $(TARGET_LIBSUPC++)
+	be screensaver localestub [ TargetLibsupc++ ]
 	[ BuildFeatureAttribute glu : library ]
 	[ BuildFeatureAttribute mesa : library ]
 ;

src/add-ons/screen_savers/gravity/Jamfile

@@ -28,7 +28,7 @@ Includes [ FGristFiles $(sources) ] :
 ScreenSaver Gravity :
 	$(sources)
 	:
-	be screensaver localestub $(TARGET_LIBSTDC++)
+	be screensaver localestub [ TargetLibstdc++ ]
 	[ BuildFeatureAttribute glu : library ]
 	[ BuildFeatureAttribute mesa : library ]
 ;

src/add-ons/screen_savers/haiku/Jamfile

@@ -9,7 +9,7 @@ AddResources Haiku : ScreenSaver.rdef ;
 
 Addon Haiku :
 	ScreenSaver.cpp
-	: be screensaver localestub $(TARGET_LIBSUPC++)
+	: be screensaver localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs Haiku :

src/add-ons/screen_savers/icons/Jamfile

@@ -7,7 +7,7 @@ AddResources Icons : Icons.rdef ;
 
 ScreenSaver Icons :
 	IconDisplay.cpp IconsSaver.cpp :
-	be libscreensaver.so localestub $(TARGET_LIBSUPC++)
+	be libscreensaver.so localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs Icons :

src/add-ons/screen_savers/ifs/Jamfile

@@ -8,7 +8,7 @@ ScreenSaver IFS :
 	IFS.cpp
 	IFSSaver.cpp
 
-	: be libscreensaver.so localestub $(TARGET_LIBSUPC++)
+	: be libscreensaver.so localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs IFS :