diff options
author | Micael Karlberg <[email protected]> | 2011-11-15 11:56:08 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-11-15 11:56:08 +0100 |
commit | ff305c1a15e34f1c8d4f923a8f0e532b4e946512 (patch) | |
tree | a2278c08fc60ad4d62e512f350db68981bee496a /lib/inets/src/inets_app/inets.mk | |
parent | 45305535f3348d8ea9a637b2236fd079e147971c (diff) | |
parent | da49021ad3323f90c95a65962b6dfff5a7b139f6 (diff) | |
download | otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.tar.gz otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.tar.bz2 otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.zip |
Merge branch 'bmk/inets/inets58_integration'
Diffstat (limited to 'lib/inets/src/inets_app/inets.mk')
-rw-r--r-- | lib/inets/src/inets_app/inets.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk index b6e9fe1d96..35fb0d7eca 100644 --- a/lib/inets/src/inets_app/inets.mk +++ b/lib/inets/src/inets_app/inets.mk @@ -33,6 +33,10 @@ ifeq ($(WARN_UNUSED_WARS), true) ERL_COMPILE_FLAGS += +warn_unused_vars endif +ifeq ($(shell erl -noshell -eval 'io:format("~4s", [erlang:system_info(otp_release)])' -s init stop), R14B) +INETS_ERL_COMPILE_FLAGS += -D'OTP-R14B-COMPILER' +endif + INETS_APP_VSN_COMPILE_FLAGS = \ +'{parse_transform,sys_pre_attributes}' \ +'{attribute,insert,app_vsn,$(APP_VSN)}' |