aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-23 15:31:23 +0100
committerSiri Hansen <[email protected]>2011-11-24 15:20:36 +0100
commitb345a094c105329f7bf83fb75f4c13dd31399dd9 (patch)
tree84b32e589b82541b6a1431d992de0257af473eeb /erts
parent3b024fc8ab28212f907df654f0718f9fd0b9c7fd (diff)
downloadotp-b345a094c105329f7bf83fb75f4c13dd31399dd9.tar.gz
otp-b345a094c105329f7bf83fb75f4c13dd31399dd9.tar.bz2
otp-b345a094c105329f7bf83fb75f4c13dd31399dd9.zip
Add +no_warn_sasl flag when compiling start_clean.rel
This suppresses the 'missing_sasl' warning from systools.
Diffstat (limited to 'erts')
-rw-r--r--erts/start_scripts/Makefile18
1 files changed, 10 insertions, 8 deletions
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index 4df7568484..c2576ee4cc 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -74,7 +74,7 @@ $(SS_ROOT)/start_clean.script \
$(SS_ROOT)/start_clean.boot: $(SS_ROOT)/start_clean.rel
$(INSTALL_DIR) $(SS_TMP)
( cd $(SS_TMP) && \
- $(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) -o $(SS_ROOT) $< )
+ $(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) +no_warn_sasl -o $(SS_ROOT) $< )
$(SS_ROOT)/start_sasl.script \
$(SS_ROOT)/start_sasl.boot: $(SS_ROOT)/start_sasl.rel
@@ -128,7 +128,7 @@ $(SS_ROOT)/start_all_example.rel: $(SS_ROOT)/start_all_example.rel.src \
$(ERL_TOP)/bin/start.script:
$(INSTALL_DIR) $(SS_TMP)
( cd $(SS_TMP) && \
- $(ERLC) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
+ $(ERLC) $(SCRIPT_PATH) +no_warn_sasl +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
$(ERL_TOP)/bin/start_sasl.script:
$(INSTALL_DIR) $(SS_TMP)
@@ -138,18 +138,20 @@ $(ERL_TOP)/bin/start_sasl.script:
$(ERL_TOP)/bin/start_clean.script:
$(INSTALL_DIR) $(SS_TMP)
( cd $(SS_TMP) && \
- $(ERLC) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
+ $(ERLC) $(SCRIPT_PATH) +no_warn_sasl +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
## Special target used from system/build/Makefile for source code release bootstrap.
bootstrap_scripts: $(SS_ROOT)/start_clean.rel
$(INSTALL_DIR) $(TESTROOT)/bin
$(INSTALL_DIR) $(SS_TMP)
( cd $(SS_TMP) && \
- $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
- -o $(TESTROOT)/bin/start.script $(SS_ROOT)/start_clean.rel )
+ $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +no_warn_sasl +otp_build \
+ +no_module_tests -o $(TESTROOT)/bin/start.script \
+ $(SS_ROOT)/start_clean.rel )
( cd $(SS_TMP) && \
- $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
- -o $(TESTROOT)/bin/start_clean.script $(SS_ROOT)/start_clean.rel )
+ $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +no_warn_sasl +otp_build \
+ +no_module_tests -o $(TESTROOT)/bin/start_clean.script \
+ $(SS_ROOT)/start_clean.rel )
clean:
$(RM) $(REL_SCRIPTS) $(INSTALL_SCRIPTS)