File tree Expand file tree Collapse file tree 2 files changed +4
-11
lines changed Expand file tree Collapse file tree 2 files changed +4
-11
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ script:
49
49
# for the explanation why extra switches needed for clang with ccache.
50
50
- CXX="ccache clang++-3.8 -Qunused-arguments -fcolor-diagnostics -Wno-tautological-compare"
51
51
CFLAGS=""
52
- LDFLAGS="-llapack"
52
+ LDFLAGS="-llapack -Wl,-fuse-ld=gold "
53
53
INCDIRS="$XROOT/usr/include"
54
54
LIBDIRS="$XROOT/usr/lib"
55
55
tools/extras/travis_script.sh
Original file line number Diff line number Diff line change @@ -31,16 +31,9 @@ include kaldi.mk
31
31
32
32
# Reset the default goal, so that the all target will become default
33
33
.DEFAULT_GOAL :=
34
- all :
35
- $(MAKE ) checkversion
36
- $(MAKE ) kaldi.mk
37
- $(MAKE ) mklibdir
38
- $(MAKE ) subdirs
39
- $(MAKE ) -C matrix test
34
+ all : $(SUBDIRS ) matrix/test
40
35
-echo Done
41
36
42
- subdirs : $(SUBDIRS )
43
-
44
37
mklibdir :
45
38
test -d $(KALDILIBDIR ) || mkdir $(KALDILIBDIR )
46
39
@@ -139,11 +132,11 @@ ext_depend: check_portaudio
139
132
140
133
141
134
.PHONY : $(SUBDIRS )
142
- $(SUBDIRS ) : mklibdir
135
+ $(SUBDIRS ) : checkversion kaldi.mk mklibdir
143
136
$(MAKE ) -C $@
144
137
145
138
.PHONY : $(EXT_SUBDIRS )
146
- $(EXT_SUBDIRS ) : mklibdir ext_depend
139
+ $(EXT_SUBDIRS ) : checkversion kaldi.mk mklibdir ext_depend
147
140
$(MAKE ) -C $@
148
141
149
142
You can’t perform that action at this time.
0 commit comments