summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--solenv/bin/callcatcher.Makefile12
2 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index df983391d51c..13a635f5596d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -336,7 +336,7 @@ findunusedcode:
@echo unexport CFLAGS >> $(SRCDIR)/config_host_callcatcher.mk
@echo unexport CXXFLAGS >> $(SRCDIR)/config_host_callcatcher.mk
@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
- @$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
+ $(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
@grep ::.*\( unusedcode.all \
| grep -v ^Atom \
| grep -v ^atom:: \
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index f915750000a9..c88b17359b57 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -18,13 +18,6 @@ export AR:=callarchive ar
else
export AR:=callarchive $(AR)
endif
-#old-school ones, can go post-gbuildification is complete
-export LINK:=$(CXX)
-ifeq ($(LIBMGR),)
-export LIBMGR:=callarchive ar
-else
-export LIBMGR:=callarchive $(LIBMGR)
-endif
export dbglevel:=2
include $(SOLARENV)/gbuild/gbuild.mk
@@ -33,9 +26,6 @@ findunusedcode:
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build
ooinstall -l $(DEVINSTALLDIR)/opt
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build subsequentcheck
- callanalyse \
- $(WORKDIR)/LinkTarget/*/* \
- */$(OUTPATH)/bin/* \
- */$(OUTPATH)/lib/* > unusedcode.all
+ callanalyse $(WORKDIR)/LinkTarget/*/* > unusedcode.all
# vim: set noet sw=4 ts=4: