boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Make gcc init parameters consistent with other toolsets. Now one needs:

Browse Source 
using gcc : 3.3 : g++-3.3 ;

not

  using gcc : 3.3 g++-3.3 ;

Also fix a typo.


[SVN r23140]
This commit is contained in:
Vladimir Prus
2004-06-21 11:01:45 +00:00
parent db4c8013f7
commit ee91fd2b96
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/gcc.jam
View File

@@ -28,15 +28,13 @@ type.set-generated-target-suffix STATIC_LIB : <toolset>gcc : a ;
# Initializes the gcc toolset
# The name parameter specifies the name used to invoke the compiler, and
# can be absolute.
rule init ( version ? name ? )
rule init ( version ? : command ? )
{
common.check-init-parameters gcc : version $(version) ;
name ?= "g++" ;
local condition = [ common.check-init-parameters gcc : version $(version) ] ;
command ?= "g++" ;
local condition = <toolset>gcc-$(version) ;
condition ?= <toolset>gcc ;
flags gcc CONFIG_NAME $(condition) : $(name) ;
flags gcc CONFIG_COMMAND $(condition) : $(command) ;
}
if [ os.name ] = NT
@@ -81,7 +79,7 @@ rule compile.c++
actions compile.c++
{
"$(CONFIG_NAME)" $(LANG) -Wall -ftemplate-depth-100 $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
"$(CONFIG_COMMAND)" $(LANG) -Wall -ftemplate-depth-100 $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
rule compile.c
@@ -98,7 +96,7 @@ rule compile.c
actions compile.c
{
"$(CONFIG_NAME)" $(LANG) -Wall $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
"$(CONFIG_COMMAND)" $(LANG) -Wall $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
@@ -133,7 +131,7 @@ rule link ( targets * : sources * : properties * )
actions link bind LIBRARIES
{
"$(CONFIG_NAME)" $(OPTIONS) -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
"$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
}
# Declare action for creating static libraries
@@ -151,7 +149,7 @@ rule link.dll ( targets * : sources * : properties * )
# Differ from 'link' above only by -shared.
actions link.dll bind LIBRARIES
{
"$(CONFIG_NAME)" $(OPTIONS) -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-h$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
"$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-h$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) "$(LIBRARIES)" -Wl,-Bdynamic -l$(FINDLIBS-SA) -Wl,-Bstatic -l$(FINDLIBS-ST) -Wl,-B$(LINK-RUNTIME)
}
# Set up threading support. It's somewhat contrived, so perform it at the end,
@@ -168,7 +166,7 @@ else if [ modules.peek : UNIX ]
case SunOS* :
{
flags gcc OPTIONS <threading>multi : -pthreads ;
flags gcc FINDLIBS <threading>multi : rt ;
flags gcc FINDLIBS-SA <threading>multi : rt ;
}
case BeOS :
{
@@ -190,7 +188,7 @@ else if [ modules.peek : UNIX ]
case * :
{
flags gcc OPTIONS <threading>multi : -pthread ;
flags gcc FINDLIBS <threading>multi : rt ;
flags gcc FINDLIBS-SA <threading>multi : rt ;
}
}
}