summaryrefslogtreecommitdiff
path: root/asmrun
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2016-11-25 11:12:56 -0500
committerGabriel Scherer <gabriel.scherer@gmail.com>2016-11-25 11:12:56 -0500
commit0657fd8193dd3ef7d0c84b9cf7f56fe9440e045a (patch)
tree85fc251abe9424cb02d08af982ccee1913488e8f /asmrun
parent0670dc2be9bf3fd67a6addbdff7a27c00866c721 (diff)
downloadocaml-0657fd8193dd3ef7d0c84b9cf7f56fe9440e045a.tar.gz
Revert "Improve handling of platforms that do not have gprof profiling support (#933)"
This reverts commit 8adfe15f182b9bfced844746bb0e8596dbf41d12. This is a temporary revert caused by Continuous Integration failure. We'll investigate the issue and merge again when it is fixed.
Diffstat (limited to 'asmrun')
-rw-r--r--asmrun/Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/asmrun/Makefile b/asmrun/Makefile
index bb7c1636f0..a5d85b7d5f 100644
--- a/asmrun/Makefile
+++ b/asmrun/Makefile
@@ -36,13 +36,7 @@ IOBJS=$(COBJS:.o=.i.o) $(ASMOBJS)
POBJS=$(COBJS:.o=.p.o) $(ASMOBJS:.o=.p.o)
PICOBJS=$(COBJS:.o=.pic.o) $(ASMOBJS:.o=.pic.o)
-ifeq "$(PROFILING)" "true"
-PROFILINGTARGET = prof
-else
-PROFILINGTARGET = noprof
-endif
-
-all: libasmrun.a all-$(RUNTIMED) all-$(PROFILINGTARGET) all-$(SHARED)
+all: libasmrun.a all-$(RUNTIMED) all-$(PROFILING) all-$(SHARED)
ifeq "$(RUNTIMEI)" "true"
all: libasmruni.a
@@ -109,9 +103,14 @@ install::
cd $(INSTALL_LIBDIR); $(RANLIB) libasmruni.a
endif
-ifeq "$(PROFILING)" "true"
+ifeq "$(PROFILING)" "prof"
install::
cp libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a
+ cd $(INSTALL_LIBDIR); $(RANLIB) libasmrunp.a
+else
+install::
+ rm -f $(INSTALL_LIBDIR)/libasmrunp.a
+ ln -s libasmrun.a $(INSTALL_LIBDIR)/libasmrunp.a
endif
ifeq "$(SHARED)" "shared"