diff options
| author | Sébastien Hinderer <Sebastien.Hinderer@inria.fr> | 2016-11-25 15:57:14 +0100 |
|---|---|---|
| committer | Damien Doligez <damien.doligez@gmail.com> | 2016-11-25 15:57:14 +0100 |
| commit | 8adfe15f182b9bfced844746bb0e8596dbf41d12 (patch) | |
| tree | 183873a2bdc276149a310e343c9aa1e3d1ddbce6 /config | |
| parent | 2bd22967b407470ce687038709571645e955d8b3 (diff) | |
| download | ocaml-8adfe15f182b9bfced844746bb0e8596dbf41d12.tar.gz | |
Improve handling of platforms that do not have gprof profiling support (#933)
This commit modifies these two behaviours:
1. ``make install'' installs libraries with profiling support only when
this makes sense.
2. On platforms that do not support profiling with gprof, the -p option of
ocamlopt produces an error message.
On such platforms, ``make install'' was installing dummy profiling
libraries and ocamlopt's -p option was silently ignored.
In addition, this commit modifies the values of the PROFILING make
variable. Before the commit it was either prof or noprof. After the
commit it is either true or false.
In the asmrun directory, the call to ranlib for libasmrunp.a has also been
removed from the install target because this command is already invoked
in the rule that builds libasmrunp.a.
ocamlc/ocamlopt -config now prints the state of profiling support
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile-templ | 4 | ||||
| -rw-r--r-- | config/Makefile.mingw | 2 | ||||
| -rw-r--r-- | config/Makefile.mingw64 | 2 | ||||
| -rw-r--r-- | config/Makefile.msvc | 2 | ||||
| -rw-r--r-- | config/Makefile.msvc64 | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/config/Makefile-templ b/config/Makefile-templ index 1cd797eb26..7e6ed685da 100644 --- a/config/Makefile-templ +++ b/config/Makefile-templ @@ -166,9 +166,9 @@ RANLIBCMD=ranlib ### Whether profiling with gprof is supported # If yes: (e.g. x86/Linux, Sparc/Solaris): -#PROFILING=prof +#PROFILING=true # If no: -#PROFILING=noprof +#PROFILING=false ### Option to give to the C compiler for profiling #CC_PROFILE=-pg diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 0abc598b8a..1918a4c9ff 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -75,7 +75,7 @@ NATIVECCRPATH= ASM=$(TOOLPREF)as ASPP=$(TOOLPREF)gcc -c ASPPPROFFLAGS= -PROFILING=noprof +PROFILING=false DYNLINKOPTS= CC_PROFILE= SYSTHREAD_SUPPORT=true diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64 index 0ff2c77d1a..795f80983d 100644 --- a/config/Makefile.mingw64 +++ b/config/Makefile.mingw64 @@ -75,7 +75,7 @@ NATIVECCRPATH= ASM=$(TOOLPREF)as ASPP=$(TOOLPREF)gcc -c ASPPPROFFLAGS= -PROFILING=noprof +PROFILING=false DYNLINKOPTS= CC_PROFILE= SYSTHREAD_SUPPORT=true diff --git a/config/Makefile.msvc b/config/Makefile.msvc index df9308edc3..4d98fb1764 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -69,7 +69,7 @@ NATIVECCRPATH= ASM=ml -nologo -coff -Cp -c -Fo ASPP= ASPPPROFFLAGS= -PROFILING=noprof +PROFILING=false DYNLINKOPTS= CC_PROFILE= SYSTHREAD_SUPPORT=true diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64 index ad0d84723a..893bbc4876 100644 --- a/config/Makefile.msvc64 +++ b/config/Makefile.msvc64 @@ -69,7 +69,7 @@ NATIVECCRPATH= ASM=ml64 -nologo -Cp -c -Fo ASPP= ASPPPROFFLAGS= -PROFILING=noprof +PROFILING=false DYNLINKOPTS= CC_PROFILE= SYSTHREAD_SUPPORT=true |