diff options
| -rw-r--r-- | rebar.config.sample | 3 | ||||
| -rw-r--r-- | src/rebar_port_compiler.erl | 25 |
2 files changed, 3 insertions, 25 deletions
diff --git a/rebar.config.sample b/rebar.config.sample index 731a3e5..4f3fd64 100644 --- a/rebar.config.sample +++ b/rebar.config.sample @@ -41,9 +41,6 @@ %% expression pass. Default is `"c_src/*.c"' {port_sources, ["c_src/*.c", {"R14", ["c_src/*.c"]}]}. -%% Port files to compile before the rest. -{port_first_files, ["c_src/first.c", "c_src/second.c"]}. - %% Port compilation environment variables. See rebar_port_compiler.erl for %% more info. Default is `[]' {port_envs, []}. diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index 4d03a97..05e157b 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -88,37 +88,18 @@ %% compile(Config, AppFile) -> - %% Allow the user to specify that dependent files get built first - FirstFiles = expand_sources(rebar_config:get(Config, - port_first_files, []), []), - %% Compose list of sources from config file -- defaults to c_src/*.c Sources = expand_sources(rebar_config:get_list(Config, port_sources, ["c_src/*.c"]), []), - Env = setup_env(Config), - - {FirstNewBins, FirstExistingBins} = case FirstFiles of - [] -> - {[], []}; - _ -> - compile_each(FirstFiles, Config, - Env, [], []) - end, case Sources of [] -> ok; _ -> - - %% Remove first files from found files - RestFiles = [Source || Source <- Sources, - not lists:member(Source, FirstFiles)], + Env = setup_env(Config), %% Compile each of the sources - {NewBins, ExistingBins} = compile_each(RestFiles, Config, Env, - [], []), - - NewBins = FirstNewBins ++ NewBins, - ExistingBins = FirstExistingBins ++ ExistingBins, + {NewBins, ExistingBins} = compile_each(Sources, Config, Env, + [], []), %% Construct the driver name and make sure priv/ exists SoSpecs = so_specs(Config, AppFile, NewBins ++ ExistingBins), |