diff options
author | Patrik Nyblom <[email protected]> | 2012-02-28 17:49:14 +0100 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2012-02-28 17:49:14 +0100 |
commit | d3a96b096f457c881296c4e7f69de47399ab9ed8 (patch) | |
tree | a4f220a3246428f2c3386978eae4965a3c5c1d55 /make/otp.mk.in | |
parent | def41007cb990ed6454ce5c78c3dcfb848975513 (diff) | |
parent | cc3122ab804299810c817f3819323234ff3e23c3 (diff) | |
download | otp-d3a96b096f457c881296c4e7f69de47399ab9ed8.tar.gz otp-d3a96b096f457c881296c4e7f69de47399ab9ed8.tar.bz2 otp-d3a96b096f457c881296c4e7f69de47399ab9ed8.zip |
Merge branch 'maint'
Diffstat (limited to 'make/otp.mk.in')
-rw-r--r-- | make/otp.mk.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index 507f040729..b9ab9dd4b5 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.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 $@) $< |