Differential D10472 Diff 27991 head/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam
Changeset View
Changeset View
Standalone View
Standalone View
head/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam
--- tools/build/src/tools/clang-linux.jam.orig 2016-09-21 14:33:28 UTC | --- tools/build/src/tools/clang-linux.jam.orig 2017-04-17 02:22:26 UTC | ||||
+++ tools/build/src/tools/clang-linux.jam | +++ tools/build/src/tools/clang-linux.jam | ||||
@@ -31,7 +31,7 @@ generators.override clang-linux.compile. | @@ -31,7 +31,7 @@ generators.override clang-linux.compile.c.pch : pch. | ||||
generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ; | generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ; | ||||
type.set-generated-target-suffix PCH | type.set-generated-target-suffix PCH | ||||
- : <toolset>clang <toolset-clang:platform>linux : pth ; | - : <toolset>clang <toolset-clang:platform>linux : pth ; | ||||
+ : <toolset>clang <toolset-clang:platform>linux : pch ; | + : <toolset>clang <toolset-clang:platform>linux : pch ; | ||||
toolset.inherit-rules clang-linux : gcc ; | toolset.inherit-rules clang-linux : gcc ; | ||||
toolset.inherit-flags clang-linux : gcc | toolset.inherit-flags clang-linux : gcc | ||||
@@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources * | @@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources * : properties | ||||
gcc.setup-fpic $(targets) : $(sources) : $(properties) ; | gcc.setup-fpic $(targets) : $(sources) : $(properties) ; | ||||
gcc.setup-address-model $(targets) : $(sources) : $(properties) ; | gcc.setup-address-model $(targets) : $(sources) : $(properties) ; | ||||
- local pth-file = [ on $(<) return $(PCH_FILE) ] ; | - local pth-file = [ on $(<) return $(PCH_FILE) ] ; | ||||
+ local pch-file = [ on $(<) return $(PCH_FILE) ] ; | + local pch-file = [ on $(<) return $(PCH_FILE) ] ; | ||||
- if $(pth-file) { | - if $(pth-file) { | ||||
- DEPENDS $(<) : $(pth-file) ; | - DEPENDS $(<) : $(pth-file) ; | ||||
Show All 14 Lines | |||||
actions compile.c++.with-pch bind PCH_FILE | 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-pth -Xclang "$(PCH_FILE)" -o "$(<)" "$(>)" | ||||
+ "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -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 * ) | rule compile.c ( targets * : sources * : properties * ) | ||||
@@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * : | @@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * : properties * | ||||
gcc.setup-fpic $(targets) : $(sources) : $(properties) ; | gcc.setup-fpic $(targets) : $(sources) : $(properties) ; | ||||
gcc.setup-address-model $(targets) : $(sources) : $(properties) ; | gcc.setup-address-model $(targets) : $(sources) : $(properties) ; | ||||
- local pth-file = [ on $(<) return $(PCH_FILE) ] ; | - local pth-file = [ on $(<) return $(PCH_FILE) ] ; | ||||
+ local pch-file = [ on $(<) return $(PCH_FILE) ] ; | + local pch-file = [ on $(<) return $(PCH_FILE) ] ; | ||||
- if $(pth-file) { | - if $(pth-file) { | ||||
- DEPENDS $(<) : $(pth-file) ; | - DEPENDS $(<) : $(pth-file) ; | ||||
Show All 15 Lines | |||||
actions compile.c.with-pch bind PCH_FILE | 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-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 "$(<)" "$(>)" | + "$(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 | @@ -153,7 +153,7 @@ rule compile.c++.pch ( targets * : sources * : propert | ||||
} | } | ||||
actions compile.c++.pch { | 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)" -c -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 "$(<)" "$(>)" | + rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)" | ||||
} | } | ||||
rule compile.c.pch ( targets * : sources * : properties * ) { | rule compile.c.pch ( targets * : sources * : properties * ) { | ||||
@@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources | @@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources * : propertie | ||||
actions compile.c.pch | 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)" -c -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 "$(<)" "$(>)" | + rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)" | ||||
} | } | ||||
############################################################################### | ############################################################################### |