diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp.mk.in | 8 | ||||
| -rw-r--r-- | make/otp_release_targets.mk | 4 | ||||
| -rw-r--r-- | make/run_make.mk | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index 507f040729..756cc85443 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -4,7 +4,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2011. All Rights Reserved. +# Copyright Ericsson AB 1997-2012. 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 @@ -115,6 +115,12 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(EBIN)/%.beam: $(ESRC)/%.erl $(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $< +ifeq ($(NATIVE_LIBS_ENABLED),yes) +# Special rule for the HIPE bootstrap w/ native libs +../boot_ebin/%.beam: $(ESRC)/%.erl + $(ERLC) $(ERL_COMPILE_FLAGS) -o../boot_ebin $< +endif + .erl.beam: $(ERLC) $(ERL_COMPILE_FLAGS) -o$(dir $@) $< diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk index f2387e4b74..fa87a4306a 100644 --- a/make/otp_release_targets.mk +++ b/make/otp_release_targets.mk @@ -110,12 +110,12 @@ endif ifeq ($(TESTROOT),) release release_docs release_tests release_html: - $(MAKE) $(MFLAGS) RELEASE_PATH=$(ERL_TOP)/release/$(TARGET) \ + $(MAKE) $(MFLAGS) RELEASE_PATH="$(ERL_TOP)/release/$(TARGET)" \ $(TARGET_MAKEFILE) $@_spec else release release_docs release_tests release_html: - $(MAKE) $(MFLAGS) RELEASE_PATH=$(TESTROOT) $(TARGET_MAKEFILE) $@_spec + $(MAKE) $(MFLAGS) RELEASE_PATH="$(TESTROOT)" $(TARGET_MAKEFILE) $@_spec endif diff --git a/make/run_make.mk b/make/run_make.mk index b2be384aa3..b7a5a64847 100644 --- a/make/run_make.mk +++ b/make/run_make.mk @@ -27,10 +27,12 @@ include $(ERL_TOP)/make/target.mk +.PHONY: valgrind + opt debug purify quantify purecov valgrind gcov gprof lcnt: $(MAKE) -f $(TARGET)/Makefile TYPE=$@ -plain smp hybrid frag smp_frag: +plain smp frag smp_frag: $(MAKE) -f $(TARGET)/Makefile FLAVOR=$@ clean generate depend docs release release_spec release_docs release_docs_spec \ |