diff options
| author | Lukas Larsson <[email protected]> | 2017-04-25 11:01:10 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-04-25 11:01:10 +0200 |
| commit | 6b57999ee020e5b1ebd8781ad7008b14cdd49688 (patch) | |
| tree | 0adbdb7225eec95ea456d8cf74d5a210ce5f219d /make | |
| parent | 0eb103aa9e05b88e4c4337973b16ed2a7e0039f7 (diff) | |
| parent | 8434b76e48b4ad1fe47b1d38dc3cac0b50d7d52d (diff) | |
| download | otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.gz otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.bz2 otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.zip | |
Merge branch 'lukas/erts/deprecate-non-smp/OTP-14272'
* lukas/erts/deprecate-non-smp/OTP-14272:
erts: Fix testcases for smp +S 1:1
erts: Deprecate the non-smp emulators
Diffstat (limited to 'make')
| -rwxr-xr-x | make/emd2exml.in | 2 | ||||
| -rw-r--r-- | make/otp.mk.in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/make/emd2exml.in b/make/emd2exml.in index b4e052fef5..13bd6700d9 100755 --- a/make/emd2exml.in +++ b/make/emd2exml.in @@ -1,6 +1,6 @@ #!@ENV@ escript %% -*- erlang -*- -%%! -smp disable +%%! %% %% %CopyrightBegin% diff --git a/make/otp.mk.in b/make/otp.mk.in index 7e2945b561..cd4572d81b 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -47,6 +47,9 @@ CROSS_COMPILING = @CROSS_COMPILING@ # ---------------------------------------------------- DEFAULT_TARGETS = opt debug release release_docs clean docs +DEFAULT_FLAVOR=@DEFAULT_FLAVOR@ +FLAVORS=@FLAVORS@ + # Slash separated list of return values from $(origin VAR) # that are untrusted - set default in this file instead. # The list is not space separated since some return values |