From 637ea131e258ec9e94ad6030a611d6a8d010e940 Mon Sep 17 00:00:00 2001 From: Dogan Can Date: Thu, 6 Mar 2014 12:10:18 +0000 Subject: [PATCH 1/2] sandbox/sail: Reverted the conditional variable assignments in tools/Makefile since make was implicitly picking up builtin variables. git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3717 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8 --- tools/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index fd0c256e9..67c4de5bc 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,8 +1,6 @@ # SHELL += -x -CXX ?= g++ -CXXFLAGS ?= -LDFLAGS ?= +CXX = g++ # On Mac OS 10.9, g++ is actually clang in disguise which by default uses the # new c++ standard library libc++. Since openfst uses stuff from the tr1 @@ -12,7 +10,7 @@ ifeq ($(findstring clang,$(COMPILER)),clang) CXXFLAGS += -stdlib=libstdc++ LDFLAGS += -stdlib=libstdc++ endif - + all: check_required_programs sph2pipe atlas irstlm_tgt sclite_tgt openfst_tgt From 18fe8a230db135d2c5bd2b48ebf53c2c9bb80b81 Mon Sep 17 00:00:00 2001 From: Dogan Can Date: Thu, 6 Mar 2014 12:16:14 +0000 Subject: [PATCH 2/2] sandbox/sail: Hard coded the make call in irstlm target to not use parallel jobs. git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3718 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8 --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 67c4de5bc..249882116 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -107,7 +107,7 @@ irstlm_tgt: irstlm_compiled .PHONY: irstlm_compiled irstlm_compiled: irstlm/Makefile cd irstlm/; \ - $(MAKE); $(MAKE) install + make; $(MAKE) install irstlm/Makefile: irstlm/.patched cd irstlm; \