Skip to content

Commit 9f981d0

Browse files
galvdanpovey
authored andcommitted
[build] Modify Makefile and travis script to fix Travis failures (#2987)
1 parent c631fcb commit 9f981d0

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ script:
4949
# for the explanation why extra switches needed for clang with ccache.
5050
- CXX="ccache clang++-3.8 -Qunused-arguments -fcolor-diagnostics -Wno-tautological-compare"
5151
CFLAGS=""
52-
LDFLAGS="-llapack"
52+
LDFLAGS="-llapack -Wl,-fuse-ld=gold"
5353
INCDIRS="$XROOT/usr/include"
5454
LIBDIRS="$XROOT/usr/lib"
5555
tools/extras/travis_script.sh

src/Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@ include kaldi.mk
3131

3232
# Reset the default goal, so that the all target will become default
3333
.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
4035
-echo Done
4136

42-
subdirs: $(SUBDIRS)
43-
4437
mklibdir:
4538
test -d $(KALDILIBDIR) || mkdir $(KALDILIBDIR)
4639

@@ -139,11 +132,11 @@ ext_depend: check_portaudio
139132

140133

141134
.PHONY: $(SUBDIRS)
142-
$(SUBDIRS) : mklibdir
135+
$(SUBDIRS) : checkversion kaldi.mk mklibdir
143136
$(MAKE) -C $@
144137

145138
.PHONY: $(EXT_SUBDIRS)
146-
$(EXT_SUBDIRS) : mklibdir ext_depend
139+
$(EXT_SUBDIRS) : checkversion kaldi.mk mklibdir ext_depend
147140
$(MAKE) -C $@
148141

149142

0 commit comments

Comments
 (0)