diff options
| author | Lukas Larsson <[email protected]> | 2014-01-28 11:58:37 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-01-28 11:58:37 +0100 |
| commit | bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18 (patch) | |
| tree | 8a50a59bb8dab3485bcd2aa1d6f3086d4f51332c /erts | |
| parent | 1bf94703047ae527004dcda59a443d4cd192704a (diff) | |
| parent | 635553bfcfdb33c337ece558240de3692920ca95 (diff) | |
| download | otp-bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18.tar.gz otp-bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18.tar.bz2 otp-bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18.zip | |
Merge branch 'rzezeski/rz_fix_dtrace_illumos/OTP-11622'
* rzezeski/rz_fix_dtrace_illumos/OTP-11622:
Fix DTrace build on Illumos
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index c992fb5bd9..c42a6c79d0 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3827,10 +3827,16 @@ if test "$enable_dtrace_test" = "yes" ; then if ! dtrace -h $DTRACE_CPP -Iemulator/beam -o ./foo-dtrace.h -s emulator/beam/erlang_dtrace.d; then AC_MSG_ERROR([Could not precompile erlang_dtrace.d: dtrace -h failed]) fi - rm -f foo-dtrace.h + + $RM -f dtest.{o,c} + cat > dtest.c <<_DTEST + #include "foo-dtrace.h" + int main(void) { ERLANG_DIST_PORT_BUSY_ENABLED(); return 0; } +_DTEST + $CC $CFLAGS -c -o dtest.o dtest.c $RM -f $DTRACE_2STEP_TEST - if dtrace -G $DTRACE_CPP $DTRACE_BITS_FLAG -Iemulator/beam -o $DTRACE_2STEP_TEST -s emulator/beam/erlang_dtrace.d 2> /dev/null && \ + if dtrace -G $DTRACE_CPP $DTRACE_BITS_FLAG -Iemulator/beam -o $DTRACE_2STEP_TEST -s emulator/beam/erlang_dtrace.d dtest.o && \ test -f $DTRACE_2STEP_TEST ; then rm $DTRACE_2STEP_TEST DTRACE_ENABLED_2STEP=yes @@ -3838,6 +3844,8 @@ if test "$enable_dtrace_test" = "yes" ; then else AC_MSG_NOTICE([dtrace precompilation for 1-stage DTrace successful]) fi + $RM -f dtest.{o,c} foo-dtrace.h + DTRACE_ENABLED=yes case $OPSYS in linux) |