diff options
| author | Erlang/OTP <[email protected]> | 2010-01-13 07:20:15 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-01-13 07:20:15 +0000 |
| commit | 009152080c9009498026db17ccee244171423c1c (patch) | |
| tree | 4b6060a8108eb696b0f86935bf8d8c5b402cdad0 /lib | |
| parent | 453190792047060494519183d185462ac1e2729a (diff) | |
| parent | 812812e3f163a21640e51905baf42bca05acfdd6 (diff) | |
| download | otp-009152080c9009498026db17ccee244171423c1c.tar.gz otp-009152080c9009498026db17ccee244171423c1c.tar.bz2 otp-009152080c9009498026db17ccee244171423c1c.zip | |
Merge branch 'bg/otp_build-improvements' into ccase/r13b04_dev
* bg/otp_build-improvements:
Fix spelling, remove obsolete command
Support updating preloaded files in a git repository
Support updating the primary bootstrap in a git repository
Determine which VCS is being used
stdlib makefile: Add explicit rule
OTP-8369: bg/otp_build-improvements
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile index 68708d6b02..37c836a254 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 1996-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 1996-2010. 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 # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% # @@ -173,8 +173,8 @@ $(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam: erl_parse.yrl $(ERLC) -o $(BOOTSTRAP_COMPILER)/egen erl_parse.yrl $(ERLC) -o $(BOOTSTRAP_COMPILER)/ebin $(BOOTSTRAP_COMPILER)/egen/erl_parse.erl -#$(BOOTSTRAP_COMPILER)/ebin/erl_lint.beam: erl_lint.erl -# $(ERLC) -o $(BOOTSTRAP_COMPILER)/ebin erl_lint.erl +$(BOOTSTRAP_TOP)/lib/stdlib/egen/erl_parse.erl: erl_parse.yrl + $(ERLC) $(YRL_FLAGS) -o$(BOOTSTRAP_TOP)/lib/stdlib/egen erl_parse.yrl $(BOOTSTRAP_COMPILER)/ebin/%.beam: %.erl $(ERLC) -o $(BOOTSTRAP_COMPILER)/ebin $< |