2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00

- unwanted changes

This commit is contained in:
SSE4
2017-09-01 16:56:02 +07:00
committed by Rene Rivera
parent b76ed007c4
commit f545689db7

View File

@@ -60,7 +60,7 @@ rule init ( version ? : command * : options * ) {
common.handle-options clang-linux : $(condition) : $(command) : $(options) ;
gcc.init-link-flags clang-linux gnu $(condition) ;
gcc.init-link-flags clang-linux $(condition) ;
# - Ranlib.
local ranlib = [ feature.get-values <ranlib> : $(options) ] ;
@@ -100,10 +100,6 @@ toolset.flags clang-linux.compile OPTIONS <rtti>off : -fno-rtti ;
# C and C++ compilation
rule compile.c++ ( targets * : sources * : properties * ) {
setup-threading $(targets) : $(sources) : $(properties) ;
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
local pth-file = [ on $(<) return $(PCH_FILE) ] ;
if $(pth-file) {
@@ -126,10 +122,6 @@ actions compile.c++.with-pch bind PCH_FILE
rule compile.c ( targets * : sources * : properties * )
{
setup-threading $(targets) : $(sources) : $(properties) ;
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
local pth-file = [ on $(<) return $(PCH_FILE) ] ;
if $(pth-file) {
@@ -155,9 +147,6 @@ actions compile.c.with-pch bind PCH_FILE
# PCH emission
rule compile.c++.pch ( targets * : sources * : properties * ) {
setup-threading $(targets) : $(sources) : $(properties) ;
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
}
actions compile.c++.pch {
@@ -165,9 +154,6 @@ actions compile.c++.pch {
}
rule compile.c.pch ( targets * : sources * : properties * ) {
setup-threading $(targets) : $(sources) : $(properties) ;
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
}
actions compile.c.pch
@@ -181,8 +167,6 @@ actions compile.c.pch
SPACE = " " ;
rule link ( targets * : sources * : properties * ) {
setup-threading $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
SPACE on $(targets) = " " ;
JAM_SEMAPHORE on $(targets) = <s>clang-linux-link-semaphore ;
}
@@ -192,29 +176,10 @@ actions link bind LIBRARIES {
}
rule link.dll ( targets * : sources * : properties * ) {
setup-threading $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
SPACE on $(targets) = " " ;
JAM_SEMAPHORE on $(targets) = <s>clang-linux-link-semaphore ;
}
rule setup-threading ( targets * : sources * : properties * )
{
local target = [ feature.get-values target-os : $(properties) ] ;
switch $(target)
{
case windows :
local threading = [ feature.get-values threading : $(properties) ] ;
if $(threading) = multi
{
OPTIONS on $(targets) += -pthread ;
}
case * : gcc.setup-threading $(targets) : $(sources) : $(properties) ;
}
}
# Differ from 'link' above only by -shared.
actions link.dll bind LIBRARIES {
"$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)