diff options
Diffstat (limited to 'devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam')
| -rw-r--r-- | devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam b/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam index 4d0f5d0e2612..9fd189a6b05c 100644 --- a/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam +++ b/devel/boost-libs/files/patch-tools_build_src_tools_clang-linux.jam @@ -1,6 +1,6 @@ ---- tools/build/src/tools/clang-linux.jam.orig 2017-04-17 02:22:26 UTC +--- tools/build/src/tools/clang-linux.jam.orig 2017-11-19 12:12:37 UTC +++ tools/build/src/tools/clang-linux.jam -@@ -31,7 +31,7 @@ generators.override clang-linux.compile.c.pch : pch. +@@ -32,7 +32,7 @@ generators.override clang-linux.compile.c.pch : pch. generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ; type.set-generated-target-suffix PCH @@ -9,10 +9,10 @@ toolset.inherit-rules clang-linux : gcc ; toolset.inherit-flags clang-linux : gcc -@@ -96,24 +96,24 @@ rule compile.c++ ( targets * : sources * : properties - gcc.setup-fpic $(targets) : $(sources) : $(properties) ; - gcc.setup-address-model $(targets) : $(sources) : $(properties) ; +@@ -101,47 +101,47 @@ toolset.flags clang-linux.compile OPTIONS <rtti>off : + # C and C++ compilation + rule compile.c++ ( targets * : sources * : properties * ) { - local pth-file = [ on $(<) return $(PCH_FILE) ] ; + local pch-file = [ on $(<) return $(PCH_FILE) ] ; @@ -40,10 +40,7 @@ } rule compile.c ( targets * : sources * : properties * ) -@@ -122,25 +122,25 @@ rule compile.c ( targets * : sources * : properties * - 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) ] ; @@ -76,17 +73,17 @@ } actions compile.c++.pch { -- rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -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-pch -o "$(<)" "$(>)" +- $(RM) -f "$(<)" && "$(CONFIG_COMMAND)" -c -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-pch -o "$(<)" "$(>)" } rule compile.c.pch ( targets * : sources * : properties * ) { -@@ -164,7 +164,7 @@ rule compile.c.pch ( targets * : sources * : propertie +@@ -161,7 +161,7 @@ rule compile.c.pch ( targets * : sources * : propertie actions compile.c.pch { -- rm -f "$(<)" && "$(CONFIG_COMMAND)" -c -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-pch -o "$(<)" "$(>)" +- $(RM) -f "$(<)" && "$(CONFIG_COMMAND)" -c -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-pch -o "$(<)" "$(>)" } ############################################################################### |