diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp.mk.in | 4 | ||||
| -rw-r--r-- | make/otp_version_tickets_in_merge | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index cdddb90734..cc76f00e7e 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -110,6 +110,10 @@ ifdef BOOTSTRAP else ERL_COMPILE_FLAGS += +debug_info endif +ifeq ($(USE_ESOCK),yes) +ERL_COMPILE_FLAGS += -DUSE_ESOCK=true +endif + ERLC_WFLAGS = -W ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS) ERL = erl -boot start_clean diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index fd9b36720a..b741526c88 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,6 +1,10 @@ -OTP-15805 -OTP-15819 -OTP-15867 -OTP-15879 -OTP-15887 -OTP-15888 +OTP-15900 +OTP-15908 +OTP-15909 +OTP-15910 +OTP-15913 +OTP-15922 +OTP-15930 +OTP-15938 +OTP-15939 +OTP-15941 |