summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Clerc <xavier.clerc@inria.fr>2011-05-30 08:36:32 +0000
committerXavier Clerc <xavier.clerc@inria.fr>2011-05-30 08:36:32 +0000
commitc70ccf5ebbcf23391fcd4df0f1b5d4acad931909 (patch)
tree79a0cdef81df6593cfcb9ecb7a4907f11de70cfb
parent50210ab28ab325f96bc00fea0193278474322762 (diff)
downloadocaml-c70ccf5ebbcf23391fcd4df0f1b5d4acad931909.tar.gz
Allow dependency upon "_oasis".
git-svn-id: http://caml.inria.fr/svn/ocaml/version/3.12@11057 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--ocamlbuild/main.ml3
1 files changed, 2 insertions, 1 deletions
diff --git a/ocamlbuild/main.ml b/ocamlbuild/main.ml
index 668fd812df..28b7c5c462 100644
--- a/ocamlbuild/main.ml
+++ b/ocamlbuild/main.ml
@@ -109,7 +109,8 @@ let proceed () =
if name = "_tags" then
ignore (Configuration.parse_file ?dir path_name);
- (String.length name > 0 && name.[0] <> '_' && name <> !Options.build_dir && not (List.mem name !Options.exclude_dirs))
+ (List.mem name ["_oasis"] || (String.length name > 0 && name.[0] <> '_'))
+ && (name <> !Options.build_dir && not (List.mem name !Options.exclude_dirs))
&& begin
if path_name <> Filename.current_dir_name && Pathname.is_directory path_name then
let tags = tags_of_pathname path_name in