aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2011-09-14 17:17:11 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2011-09-14 17:17:11 +0200
commit68c96ca855821adb42a25ced5b69446ae7ccc635 (patch)
tree8c4d9cbbb8d349aaf54ceb3344367ae078adf83f
parentb4a8af7158107ded0a3c5f7a51883c77a16b5c26 (diff)
parent4792b253584ca8d4429e1a353178db8cd0c470f4 (diff)
downloadotp-68c96ca855821adb42a25ced5b69446ae7ccc635.tar.gz
otp-68c96ca855821adb42a25ced5b69446ae7ccc635.tar.bz2
otp-68c96ca855821adb42a25ced5b69446ae7ccc635.zip
Merge branch 'bjorn/compiler-options/OTP-9534' into dev
* bjorn/compiler-options/OTP-9534: sys_pre_expand: Don't duplicate options given in the source code
-rw-r--r--lib/compiler/src/sys_pre_expand.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index 480954adac..dd6f24e21f 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -223,10 +223,8 @@ attribute(export, Es, _L, St) ->
St#expand{exports=union(from_list(Es), St#expand.exports)};
attribute(import, Is, _L, St) ->
import(Is, St);
-attribute(compile, C, _L, St) when is_list(C) ->
- St#expand{compile=St#expand.compile ++ C};
-attribute(compile, C, _L, St) ->
- St#expand{compile=St#expand.compile ++ [C]};
+attribute(compile, _C, _L, St) ->
+ St;
attribute(Name, Val, Line, St) when is_list(Val) ->
St#expand{attributes=St#expand.attributes ++ [{Name,Line,Val}]};
attribute(Name, Val, Line, St) ->