aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-02-28 17:49:14 +0100
committerPatrik Nyblom <[email protected]>2012-02-28 17:49:14 +0100
commitd3a96b096f457c881296c4e7f69de47399ab9ed8 (patch)
treea4f220a3246428f2c3386978eae4965a3c5c1d55 /Makefile.in
parentdef41007cb990ed6454ce5c78c3dcfb848975513 (diff)
parentcc3122ab804299810c817f3819323234ff3e23c3 (diff)
downloadotp-d3a96b096f457c881296c4e7f69de47399ab9ed8.tar.gz
otp-d3a96b096f457c881296c4e7f69de47399ab9ed8.tar.bz2
otp-d3a96b096f457c881296c4e7f69de47399ab9ed8.zip
Merge branch 'maint'
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 0b1f0930ca..761d37ac02 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -157,6 +157,14 @@ ERLANG_LIBDIR = $(DESTDIR)$(ERLANG_INST_LIBDIR)
# Must be GNU make!
MAKE = @MAKE_PROG@
+NATIVE_LIBS_ENABLED = @NATIVE_LIBS_ENABLED@
+
+ifeq ($(NATIVE_LIBS_ENABLED),yes)
+HIPE_BOOTSTRAP_EBIN = boot_ebin
+else
+HIPE_BOOTSTRAP_EBIN = ebin
+endif
+
# This should be set to the target "arch-vendor-os"
TARGET := @TARGET@
include $(ERL_TOP)/make/target.mk
@@ -527,7 +535,7 @@ secondary_bootstrap_build:
secondary_bootstrap_copy:
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; fi
- for x in lib/hipe/ebin/*.beam; do \
+ for x in lib/hipe/$(HIPE_BOOTSTRAP_EBIN)/*.beam; do \
BN=`basename $$x`; \
TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin/$$BN; \
test -f $$TF && \
@@ -537,7 +545,6 @@ secondary_bootstrap_copy:
cp $$x $$TF; \
true; \
done
-# if test -f lib/hipe/ebin/hipe.beam ; then cp lib/hipe/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; fi