blob: 5f25fd3e5823e7e9d7b261921ccd9902ecaa7519 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
--- tools/build/src/tools/clang-linux.jam.orig 2016-09-21 14:33:28 UTC
+++ tools/build/src/tools/clang-linux.jam
@@ -31,7 +31,7 @@ generators.override clang-linux.compile.
generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ;
type.set-generated-target-suffix PCH
- : <toolset>clang <toolset-clang:platform>linux : pth ;
+ : <toolset>clang <toolset-clang:platform>linux : pch ;
toolset.inherit-rules clang-linux : gcc ;
toolset.inherit-flags clang-linux : gcc
@@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources *
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
- local pth-file = [ on $(<) return $(PCH_FILE) ] ;
+ local pch-file = [ on $(<) return $(PCH_FILE) ] ;
- if $(pth-file) {
- DEPENDS $(<) : $(pth-file) ;
+ if $(pch-file) {
+ DEPENDS $(<) : $(pch-file) ;
clang-linux.compile.c++.with-pch $(targets) : $(sources) ;
}
else {
- clang-linux.compile.c++.without-pth $(targets) : $(sources) ;
+ clang-linux.compile.c++.without-pch $(targets) : $(sources) ;
}
}
-actions compile.c++.without-pth {
+actions compile.c++.without-pch {
"$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -o "$(<)" "$(>)"
}
actions compile.c++.with-pch bind PCH_FILE
{
- "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pth -Xclang "$(PCH_FILE)" -o "$(<)" "$(>)"
+ "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -o "$(<)" "$(>)"
}
rule compile.c ( targets * : sources * : properties * )
@@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * :
gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
- local pth-file = [ on $(<) return $(PCH_FILE) ] ;
+ local pch-file = [ on $(<) return $(PCH_FILE) ] ;
- if $(pth-file) {
- DEPENDS $(<) : $(pth-file) ;
+ if $(pch-file) {
+ DEPENDS $(<) : $(pch-file) ;
clang-linux.compile.c.with-pch $(targets) : $(sources) ;
}
else {
- clang-linux.compile.c.without-pth $(targets) : $(sources) ;
+ clang-linux.compile.c.without-pch $(targets) : $(sources) ;
}
}
-actions compile.c.without-pth
+actions compile.c.without-pch
{
"$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
}
actions compile.c.with-pch bind PCH_FILE
{
- "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pth -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
+ "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
}
###############################################################################
@@ -153,7 +153,7 @@ rule compile.c++.pch ( targets * : sourc
}
actions compile.c++.pch {
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
}
rule compile.c.pch ( targets * : sources * : properties * ) {
@@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources
actions compile.c.pch
{
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pth -o "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
}
###############################################################################
|
