aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-30 09:34:19 +0100
committerSiri Hansen <[email protected]>2011-11-30 09:34:19 +0100
commit536a36808f91e449d5ec9ab2a3dfcc9a137469f4 (patch)
tree1082c06974f84b4934985c5d1a201c0b028eddb5
parentfa0f8d2c29b9ec44f0fa85cacc375979b175348b (diff)
parent1cf38712b050cdaf924637a14e232d872bf54b2b (diff)
downloadotp-536a36808f91e449d5ec9ab2a3dfcc9a137469f4.tar.gz
otp-536a36808f91e449d5ec9ab2a3dfcc9a137469f4.tar.bz2
otp-536a36808f91e449d5ec9ab2a3dfcc9a137469f4.zip
Merge branch 'siri/sasl/no-warn-missing-sasl/OTP-9738'
* siri/sasl/no-warn-missing-sasl/OTP-9738: Don't use +no_warn_sasl option to systools for bootstrap
-rw-r--r--erts/start_scripts/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index c2576ee4cc..d8e39062e3 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -145,13 +145,11 @@ bootstrap_scripts: $(SS_ROOT)/start_clean.rel
$(INSTALL_DIR) $(TESTROOT)/bin
$(INSTALL_DIR) $(SS_TMP)
( cd $(SS_TMP) && \
- $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +no_warn_sasl +otp_build \
- +no_module_tests -o $(TESTROOT)/bin/start.script \
- $(SS_ROOT)/start_clean.rel )
+ $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
+ -o $(TESTROOT)/bin/start.script $(SS_ROOT)/start_clean.rel )
( cd $(SS_TMP) && \
- $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +no_warn_sasl +otp_build \
- +no_module_tests -o $(TESTROOT)/bin/start_clean.script \
- $(SS_ROOT)/start_clean.rel )
+ $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
+ -o $(TESTROOT)/bin/start_clean.script $(SS_ROOT)/start_clean.rel )
clean:
$(RM) $(REL_SCRIPTS) $(INSTALL_SCRIPTS)