diff options
| author | Lukas Larsson <[email protected]> | 2014-02-20 10:45:18 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-02-20 10:45:18 +0100 |
| commit | b1bb2f339698ac5abdc6f821025c1c638e9a772f (patch) | |
| tree | 702946f4d031aa08d7c66333918828bfb1e7e827 /erts/emulator | |
| parent | d7889a517476a212831f87596dd7b232eed752f8 (diff) | |
| parent | 60cd55e47bc2f3eee4d8d90814491248e371feaf (diff) | |
| download | otp-b1bb2f339698ac5abdc6f821025c1c638e9a772f.tar.gz otp-b1bb2f339698ac5abdc6f821025c1c638e9a772f.tar.bz2 otp-b1bb2f339698ac5abdc6f821025c1c638e9a772f.zip | |
Merge branch 'lukas/erts/dtrace-config-logging/OTP-11622'
* lukas/erts/dtrace-config-logging/OTP-11622:
dtrace: Update dtrace docs with latest tested platforms
erts: Fix dtrace generation on FreeBSD
erts: Rewrite dtrace configure test
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index f88a4ccc24..74e0d26cff 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -513,10 +513,9 @@ ifdef DTRACE_ENABLED # global.h causes problems by including dtrace-wrapper.h which includes # the autogenerated erlang_dtrace.h ... so make erlang_dtrace.h very early. DTRACE_HEADERS = $(TARGET)/erlang_dtrace.h -generate: $(DTRACE_HEADERS) $(GENERATE) +GENERATE+= $(DTRACE_HEADERS) else DTRACE_HEADERS = -generate: $(GENERATE) endif ifdef HIPE_ENABLED |