Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[fix] objctFile,rebuild: check for existing compiled package was brok…

…en since change to new backend
  • Loading branch information...
commit 37067dd852b9c129dd0e44300a0ce5c4f810daa4 1 parent cfe0f11
@OpaOnWindowsNow OpaOnWindowsNow authored
View
3  compiler/compilerlib/objectFiles.ml
@@ -1573,8 +1573,7 @@ let reorder :
try
if ConsistencyCheckR.load_hash_exn package = digest (*package on disk has the same hash _as the files*) then (
try
- if File.is_regular (filename_from_package package last_pass)
- || File.is_directory (filename_from_package package "_build") then (
+ if File.is_regular (filename_from_package package last_pass) then (
if check_consistency_of_conf package then
if check_date_of_static_inclusions package then (
(* merge_assoc succeeds -> consistent *)
View
10 compiler/opa/pass_EndOfSeparateCompilation.ml
@@ -1,5 +1,5 @@
(*
- Copyright © 2011 MLstate
+ Copyright © 2011, 2012 MLstate
This file is part of Opa.
@@ -80,9 +80,11 @@ let process_code :
S.pesc_gamma = merge_gamma ?package gamma1 gamma2;
S.pesc_schema = schema;
} in
- if ObjectFiles.Arg.is_fully_separated () then
- k env
- else (
+ if ObjectFiles.Arg.is_fully_separated () then (
+ let v = k env in
+ R.save initial;
+ v
+ ) else (
match ObjectFiles.compilation_mode () with
| `init ->
k env
Please sign in to comment.
Something went wrong with that request. Please try again.