diff options
| author | Siri Hansen <[email protected]> | 2017-05-19 15:27:46 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-19 15:27:46 +0200 |
| commit | 52ace0d2c565a67e587159780114792c55244312 (patch) | |
| tree | 1b21b16cc9c14cf78f4c9ed30f302bd8165a8736 /make/otp.mk.in | |
| parent | 7ff352ef8a5393a017ce493ba1a1fc3be54be245 (diff) | |
| parent | a237426d43b73d931739d9acb86a17513b44ed3e (diff) | |
| download | otp-52ace0d2c565a67e587159780114792c55244312.tar.gz otp-52ace0d2c565a67e587159780114792c55244312.tar.bz2 otp-52ace0d2c565a67e587159780114792c55244312.zip | |
Merge branch 'master' into jv-gen-server-exits
Diffstat (limited to 'make/otp.mk.in')
| -rw-r--r-- | make/otp.mk.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index cd4572d81b..83bab7065d 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -49,6 +49,7 @@ DEFAULT_TARGETS = opt debug release release_docs clean docs DEFAULT_FLAVOR=@DEFAULT_FLAVOR@ FLAVORS=@FLAVORS@ +TYPES=@TYPES@ # Slash separated list of return values from $(origin VAR) # that are untrusted - set default in this file instead. |