X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.in;h=c09fc505881b393afd7ac1f34b03a513d7ab50f6;hb=3582bab41908a649c975ae98ad97a0d84b48dcde;hp=2eb7bfd0443827ed903b902aa7c1034b66652109;hpb=cdf3116b6e107a21269751fc180ad0bb84c3960c;p=riscv-isa-sim.git

diff --git a/Makefile.in b/Makefile.in
index 2eb7bfd..c09fc50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,9 +55,9 @@ enable_stow  := @enable_stow@
 
 ifeq ($(enable_stow),yes)
   stow_pkg_dir := $(prefix)/pkgs
-  INSTALLDIR ?= $(DESTDIR)/$(stow_pkg_dir)/$(project_name)-$(project_ver)
+  INSTALLDIR ?= $(DESTDIR)$(stow_pkg_dir)/$(project_name)-$(project_ver)
 else
-  INSTALLDIR ?= $(DESTDIR)/$(prefix)
+  INSTALLDIR ?= $(DESTDIR)$(prefix)
 endif
 
 install_hdrs_dir := $(INSTALLDIR)/include/$(project_name)
@@ -71,7 +71,7 @@ install_exes_dir := $(INSTALLDIR)/bin
 sprojs         := @subprojects@
 sprojs_enabled := @subprojects_enabled@
 
-sprojs_include := -I. $(addprefix -I$(src_dir)/, $(sprojs_enabled))
+sprojs_include := -I. -I$(src_dir) $(addprefix -I$(src_dir)/, $(sprojs_enabled))
 VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 
 #-------------------------------------------------------------------------
@@ -84,9 +84,9 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 
 CC            := @CC@
 CXX           := @CXX@
-CFLAGS        += @CFLAGS@ -DPREFIX=\"$(prefix)\" -Werror
+CFLAGS        += @CFLAGS@ -DPREFIX=\"$(prefix)\"
 CPPFLAGS      += @CPPFLAGS@
-CXXFLAGS      += @CXXFLAGS@ -DPREFIX=\"$(prefix)\" -Werror
+CXXFLAGS      += @CXXFLAGS@ -DPREFIX=\"$(prefix)\"
 COMPILE       := $(CXX) -fPIC -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
                  $(sprojs_include)
 COMPILE_C     := $(CC) -fPIC -MMD -MP $(CPPFLAGS) $(CFLAGS) \
@@ -121,8 +121,7 @@ INSTALL_EXE   := $(INSTALL) -m 555
 STOW          := @stow@
 
 # Tests
-bintests = tests/gdbserver.py \
-	   tests/ebreak.py
+bintests = $(src_dir)/tests/ebreak.py
 
 #-------------------------------------------------------------------------
 # Include subproject makefile fragments
@@ -195,7 +194,7 @@ $(2)_deps := $$(patsubst %.o, %.d, $$($(2)_objs))
 $(2)_deps += $$(patsubst %.o, %.d, $$($(2)_c_objs))
 $(2)_deps += $$(patsubst %.h, %.h.d, $$($(2)_precompiled_hdrs))
 $$($(2)_pch) : %.h.gch : %.h
-	$(COMPILE) $$< -o $$@
+	$(COMPILE) -x c++-header $$< -o $$@
 # If using clang, don't depend (and thus don't build) precompiled headers
 $$($(2)_objs) : %.o : %.cc $$($(2)_gen_hdrs) $(if $(filter-out clang,$(CC)),$$($(2)_pch))
 	$(COMPILE) -c $$<
@@ -339,10 +338,12 @@ junk += $(bintest_outs)
 	./$* < /dev/null 2>&1 | tee $@
 
 check-cpp : $(test_outs)
-	echo; grep -h -e'Unit Tests' -e'FAILED' -e'Segmentation' $^ < /dev/null; echo
+	@echo
+	! grep -h -e'Unit Tests' -e'FAILED' -e'Segmentation' $^ < /dev/null
+	@echo
 
 check-bin : $(bintest_outs)
-	tail -n 1 $^ < /dev/null
+	! tail -n 1 $^ < /dev/null 2>&1 | grep FAILED
 
 check : check-cpp check-bin