aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostis Sagonas <[email protected]>2017-03-27 15:10:20 +0200
committerKostis Sagonas <[email protected]>2017-03-27 15:10:20 +0200
commit70bdb9e79429fb347c5437743d0e8f6851e0783d (patch)
tree3e5180b7c57b585ba12ed389a7a56d65cd26b4c2
parentbe2b0e6e5b4786cb6f7d56cdcdc05339aa214406 (diff)
downloadotp-70bdb9e79429fb347c5437743d0e8f6851e0783d.tar.gz
otp-70bdb9e79429fb347c5437743d0e8f6851e0783d.tar.bz2
otp-70bdb9e79429fb347c5437743d0e8f6851e0783d.zip
Add a no_native option wherever there is an on_load
This is a poor man's solution that allows to build and test the system with all files compiled to native code simply by setting the ERL_COMPILER_OPTS environment variable. Better solutions, like automatically setting the no_native option whenever the compiler sees an on_load attribute, obviously exist but require more time to implement.
-rw-r--r--lib/asn1/src/asn1rt_nif.erl1
-rw-r--r--lib/crypto/src/crypto.erl1
-rw-r--r--lib/runtime_tools/src/dyntrace.erl2
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1rt_nif.erl b/lib/asn1/src/asn1rt_nif.erl
index ff464885f6..e540b9f50d 100644
--- a/lib/asn1/src/asn1rt_nif.erl
+++ b/lib/asn1/src/asn1rt_nif.erl
@@ -26,6 +26,7 @@
decode_ber_tlv/1,
encode_ber_tlv/1]).
+-compile(no_native).
-on_load(load_nif/0).
-define(ASN1_NIF_VSN,1).
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index ce8add6559..d322765dff 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -56,6 +56,7 @@
%%-type ec_curve() :: ec_named_curve() | ec_curve_spec().
%%-type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}.
+-compile(no_native).
-on_load(on_load/0).
-define(CRYPTO_NIF_VSN,302).
diff --git a/lib/runtime_tools/src/dyntrace.erl b/lib/runtime_tools/src/dyntrace.erl
index 58c5a773c3..5fe62a46f6 100644
--- a/lib/runtime_tools/src/dyntrace.erl
+++ b/lib/runtime_tools/src/dyntrace.erl
@@ -61,8 +61,8 @@
enabled_garbage_collection/3,
enabled/3]).
-
-export([user_trace_i4s4/9]). % Know what you're doing!
+-compile(no_native).
-on_load(on_load/0).
-type probe_arg() :: integer() | iolist().