diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-18 15:53:02 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-18 15:53:02 +0200 |
| commit | 8c63450c68b14e9dd0086b1748d4cdf5510be8dc (patch) | |
| tree | 3b46109b9f60eaf6d56816efe370085809a7431b | |
| parent | 6e1f1f59263a717ffcef2ebcd70592431a02cf2f (diff) | |
| parent | 88d149aacbda437b0e2732d69bdb1f08e63eadb2 (diff) | |
| download | otp-8c63450c68b14e9dd0086b1748d4cdf5510be8dc.tar.gz otp-8c63450c68b14e9dd0086b1748d4cdf5510be8dc.tar.bz2 otp-8c63450c68b14e9dd0086b1748d4cdf5510be8dc.zip | |
Merge branch 'pan/escript_in_bootstrap/OTP-9309' into dev
* pan/escript_in_bootstrap/OTP-9309:
Add escript to bootstrap/bin
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index b17713f182..5acd390333 100644 --- a/Makefile.in +++ b/Makefile.in @@ -502,6 +502,7 @@ ifeq ($(TARGET),win32) bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erl.exe \ $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc.exe \ + $(BOOTSTRAP_ROOT)/bootstrap/bin/escript.exe \ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl.ini \ $(BOOTSTRAP_ROOT)/bootstrap/bin/beam.dll make_bootstrap_ini.sh $(BOOTSTRAP_ROOT)/bootstrap \ @@ -510,8 +511,10 @@ bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc.exe @cp $(ERL_TOP)/bin/$(TARGET)/erl.exe \ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl.exe + @cp $(ERL_TOP)/bin/$(TARGET)/escript.exe \ + $(BOOTSTRAP_ROOT)/bootstrap/bin/escript.exe else -bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target $(BOOTSTRAP_ROOT)/bootstrap/bin/erl $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc +bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target $(BOOTSTRAP_ROOT)/bootstrap/bin/erl $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc $(BOOTSTRAP_ROOT)/bootstrap/bin/escript $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/etc/unix/erl.src.src $(BOOTSTRAP_ROOT)/bootstrap/target @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erl @@ -526,6 +529,11 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc: $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc @cp $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc @chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc + +$(BOOTSTRAP_ROOT)/bootstrap/bin/escript: $(ERL_TOP)/bin/$(TARGET)/escript $(BOOTSTRAP_ROOT)/bootstrap/target + @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/escript + @cp $(ERL_TOP)/bin/$(TARGET)/escript $(BOOTSTRAP_ROOT)/bootstrap/bin/escript + @chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/escript endif bootstrap_setup_target: |