File tree Expand file tree Collapse file tree 4 files changed +3
-15
lines changed Expand file tree Collapse file tree 4 files changed +3
-15
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 9bfe296eb720e56803126a5c639b713f9032298b
2
+ refs/heads/master: 858ca2e3c8ef0704fd333cd4a092976324538830
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
5
5
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
Original file line number Diff line number Diff line change 561
561
| cut -d ' ' -f 2)
562
562
563
563
case $CFG_CLANG_VERSION in
564
- (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4 * )
564
+ (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* )
565
565
step_msg " found ok version of CLANG: $CFG_CLANG_VERSION "
566
566
CFG_C_COMPILER=" clang"
567
567
;;
@@ -970,13 +970,6 @@ then
970
970
putvar CFG_CCACHE_CPP2
971
971
fi
972
972
973
- if [ ! -z " $CFG_ENABLE_CCACHE " ]
974
- then
975
- CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
976
- putvar CFG_CCACHE_BASEDIR
977
- fi
978
-
979
-
980
973
if [ ! -z $BAD_PANDOC ]
981
974
then
982
975
CFG_PANDOC=
Original file line number Diff line number Diff line change @@ -396,11 +396,6 @@ ifeq ($(CFG_CCACHE_CPP2),1)
396
396
export CCACHE_CPP
397
397
endif
398
398
399
- ifdef CFG_CCACHE_BASEDIR
400
- CCACHE_BASEDIR =$(CFG_CCACHE_BASEDIR )
401
- export CCACHE_BASEDIR
402
- endif
403
-
404
399
define CFG_MAKE_TOOLCHAIN
405
400
CFG_COMPILE_C_$(1 ) = $$(CC_$(1 ) ) \
406
401
$$(CFG_GCCISH_CFLAGS ) \
Original file line number Diff line number Diff line change @@ -666,7 +666,7 @@ TEST_GROUPS = \
666
666
perf \
667
667
debuginfo \
668
668
doc \
669
- $(foreach docname,$(DOC_TEST_NAMES ) ,$(docname ) ) \
669
+ $(foreach docname,$(DOC_TEST_NAMES ) ,doc- $(docname ) ) \
670
670
pretty \
671
671
pretty-rpass \
672
672
pretty-rpass-full \
You can’t perform that action at this time.
0 commit comments