Skip to content

WIP: [travis] Try splitting two tasks to remove duplicated tasks. #2987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 3 commits into from
Jan 14, 2019
Merged

WIP: [travis] Try splitting two tasks to remove duplicated tasks. #2987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f795728
WIP: Try splitting two tasks to remove duplicated tasks.
galv Jan 12, 2019
2870870
Remove subprocess-based task serialization.
galv Jan 13, 2019
b6d2042
Whitespace fix.
galv Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ script:
# for the explanation why extra switches needed for clang with ccache.
- CXX="ccache clang++-3.8 -Qunused-arguments -fcolor-diagnostics -Wno-tautological-compare"
CFLAGS=""
LDFLAGS="-llapack"
LDFLAGS="-llapack -Wl,-fuse-ld=gold"
INCDIRS="$XROOT/usr/include"
LIBDIRS="$XROOT/usr/lib"
tools/extras/travis_script.sh
Expand Down
13 changes: 3 additions & 10 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,9 @@ include kaldi.mk

# Reset the default goal, so that the all target will become default
.DEFAULT_GOAL :=
all:
$(MAKE) checkversion
$(MAKE) kaldi.mk
$(MAKE) mklibdir
$(MAKE) subdirs
$(MAKE) -C matrix test
all: $(SUBDIRS) matrix/test
-echo Done

subdirs: $(SUBDIRS)

mklibdir:
test -d $(KALDILIBDIR) || mkdir $(KALDILIBDIR)

Expand Down Expand Up @@ -139,11 +132,11 @@ ext_depend: check_portaudio


.PHONY: $(SUBDIRS)
$(SUBDIRS) : mklibdir
$(SUBDIRS) : checkversion kaldi.mk mklibdir
$(MAKE) -C $@

.PHONY: $(EXT_SUBDIRS)
$(EXT_SUBDIRS) : mklibdir ext_depend
$(EXT_SUBDIRS) : checkversion kaldi.mk mklibdir ext_depend
$(MAKE) -C $@


Expand Down