diff options
| author | Lukas Larsson <[email protected]> | 2017-03-21 13:40:08 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-04-21 14:30:22 +0200 |
| commit | f30d131bd979e29b68fb7d9ff515c61a246201f4 (patch) | |
| tree | aa034229bef00fcb99d2e50ecbcab2b7700df50d /make | |
| parent | 621cedccc78581330b9628c559b0d851c303564f (diff) | |
| download | otp-f30d131bd979e29b68fb7d9ff515c61a246201f4.tar.gz otp-f30d131bd979e29b68fb7d9ff515c61a246201f4.tar.bz2 otp-f30d131bd979e29b68fb7d9ff515c61a246201f4.zip | |
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 |