]>
Commit | Line | Data |
---|---|---|
cbe7d7b5 SS |
1 | diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam |
2 | --- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100 | |
3 | +++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100 | |
4 | @@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch | |
5 | toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ; | |
6 | ||
7 | # Declare flags and action for compilation. | |
8 | -toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; | |
9 | -toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ; | |
10 | -toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; | |
11 | +toolset.flags gcc.compile OPTIONS <optimization>off : ; | |
12 | +toolset.flags gcc.compile OPTIONS <optimization>speed : ; | |
13 | +toolset.flags gcc.compile OPTIONS <optimization>space : ; | |
14 | ||
15 | -toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; | |
16 | -toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ; | |
17 | -toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ; | |
18 | +toolset.flags gcc.compile OPTIONS <inlining>off : ; | |
19 | +toolset.flags gcc.compile OPTIONS <inlining>on : ; | |
20 | +toolset.flags gcc.compile OPTIONS <inlining>full : ; | |
21 | ||
22 | -toolset.flags gcc.compile OPTIONS <warnings>off : -w ; | |
23 | -toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ; | |
24 | -toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ; | |
25 | +toolset.flags gcc.compile OPTIONS <warnings>off : ; | |
26 | +toolset.flags gcc.compile OPTIONS <warnings>on : ; | |
27 | +toolset.flags gcc.compile OPTIONS <warnings>all : ; | |
28 | toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ; | |
29 | ||
30 | toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ; | |
31 | @@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc | |
32 | ||
33 | actions compile.c++ bind PCH_FILE | |
34 | { | |
35 | - "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" | |
36 | + "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" | |
37 | } | |
38 | ||
39 | actions compile.c bind PCH_FILE | |
40 | @@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE | |
41 | ||
42 | actions compile.c++.preprocess bind PCH_FILE | |
43 | { | |
44 | - "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" | |
45 | + "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" | |
46 | } | |
47 | ||
48 | actions compile.c.preprocess bind PCH_FILE |