Skip to content

Commit 8e6d4f6

Browse files
committed
---
yaml --- r: 65451 b: refs/heads/master c: 858ca2e h: refs/heads/master i: 65449: 384a13b 65447: dda1766 v: v3
1 parent 09578a5 commit 8e6d4f6

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 9bfe296eb720e56803126a5c639b713f9032298b
2+
refs/heads/master: 858ca2e3c8ef0704fd333cd4a092976324538830
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/configure

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ then
561561
| cut -d ' ' -f 2)
562562

563563
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*)
565565
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
566566
CFG_C_COMPILER="clang"
567567
;;
@@ -970,13 +970,6 @@ then
970970
putvar CFG_CCACHE_CPP2
971971
fi
972972

973-
if [ ! -z "$CFG_ENABLE_CCACHE" ]
974-
then
975-
CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
976-
putvar CFG_CCACHE_BASEDIR
977-
fi
978-
979-
980973
if [ ! -z $BAD_PANDOC ]
981974
then
982975
CFG_PANDOC=

trunk/mk/platform.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,6 @@ ifeq ($(CFG_CCACHE_CPP2),1)
396396
export CCACHE_CPP
397397
endif
398398

399-
ifdef CFG_CCACHE_BASEDIR
400-
CCACHE_BASEDIR=$(CFG_CCACHE_BASEDIR)
401-
export CCACHE_BASEDIR
402-
endif
403-
404399
define CFG_MAKE_TOOLCHAIN
405400
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
406401
$$(CFG_GCCISH_CFLAGS) \

trunk/mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ TEST_GROUPS = \
666666
perf \
667667
debuginfo \
668668
doc \
669-
$(foreach docname,$(DOC_TEST_NAMES),$(docname)) \
669+
$(foreach docname,$(DOC_TEST_NAMES),doc-$(docname)) \
670670
pretty \
671671
pretty-rpass \
672672
pretty-rpass-full \

0 commit comments

Comments
 (0)