aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-07-13 13:29:34 +0200
committerRickard Green <[email protected]>2018-07-13 13:29:34 +0200
commit212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6 (patch)
treee307b4d3b7ac2f33f85ce0b795badad424c390fe /make
parent6ff0857f6385848248f38e6315881f6ffc44729f (diff)
parenta3a900e382ccba96ef15369c5771070e538b8367 (diff)
downloadotp-212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6.tar.gz
otp-212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6.tar.bz2
otp-212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Update release notes Update version numbers Fix trace_info/2 Provide build support for standalone corba repo Fix release notes for OTP-21.0.2 Move to a dirty scheduler even when we have pending system tasks
Diffstat (limited to 'make')
-rw-r--r--make/otp.mk.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in
index c514a150ca..df29d26833 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -87,6 +87,13 @@ AR = @AR@
PERL = @PERL@
LLVM_PROFDATA = @LLVM_PROFDATA@
+MIXED_CYGWIN_VC = @MIXED_CYGWIN_VC@
+MIXED_MSYS_VC = @MIXED_MSYS_VC@
+MIXED_VC = @MIXED_VC@
+MIXED_CYGWIN_MINGW = @MIXED_CYGWIN_MINGW@
+MIXED_CYGWIN = @MIXED_CYGWIN@
+MIXED_MSYS = @MIXED_MSYS@
+
BITS64 = @BITS64@
OTP_RELEASE = @OTP_RELEASE@