Skip to content
Snippets Groups Projects
Commit 3808b5ba authored by Lukas Stadler's avatar Lukas Stadler
Browse files

output native build logs upon failure

parent 897e5601
Branches
No related tags found
No related merge requests found
...@@ -89,12 +89,12 @@ $(ICONV): ...@@ -89,12 +89,12 @@ $(ICONV):
iconv_config: $(ICONV)/Makefile iconv_config: $(ICONV)/Makefile
$(ICONV)/Makefile: $(ICONV)/Makefile:
(cd $(ICONV); ./configure --prefix $(ICONV_INSTALL) $(ICONV_CONFIG_FLAGS) > iconv_configure.log 2>&1) (cd $(ICONV); ./configure --prefix $(ICONV_INSTALL) $(ICONV_CONFIG_FLAGS) > iconv_configure.log 2>&1 || cat iconv_configure.log)
iconv_build: $(ICONV)/lib/libcharset.so iconv_build: $(ICONV)/lib/libcharset.so
$(ICONV)/lib/libcharset.so: $(ICONV)/lib/libcharset.so:
(cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1) (cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1 || cat iconv_make.log)
else else
GNUR_CONFIG_FLAGS := CFLAGS=-DLIBICONV_PLUG CPPFLAGS=-DLIBICONV_PLUG CXXFLAGS=-DLIBICONV_PLUG GNUR_CONFIG_FLAGS := CFLAGS=-DLIBICONV_PLUG CPPFLAGS=-DLIBICONV_PLUG CXXFLAGS=-DLIBICONV_PLUG
iconv: iconv:
...@@ -116,12 +116,12 @@ endif ...@@ -116,12 +116,12 @@ endif
$(GNUR_HOME)/Makefile: $(GNUR_HOME)/Makefile:
ed $(GNUR_HOME)/src/extra/xz/Makefile.in < patchXzMakefile ed $(GNUR_HOME)/src/extra/xz/Makefile.in < patchXzMakefile
(cd $(GNUR_HOME); ./configure --with-x=no --without-recommended-packages $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1) (cd $(GNUR_HOME); ./configure --with-x=no --without-recommended-packages $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1 || cat gnur_configure.log)
build: $(GNUR_HOME)/bin/R build: $(GNUR_HOME)/bin/R
$(GNUR_HOME)/bin/R: $(GNUR_HOME)/Makeconf $(GNUR_HOME)/bin/R: $(GNUR_HOME)/Makeconf
(cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1) (cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1 || cat gnur_make.log)
clean: cleangnur cleaniconv clean: cleangnur cleaniconv
rm -f Makeconf.done rm -f Makeconf.done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment