Skip to content
This repository has been archived by the owner on Jun 4, 2019. It is now read-only.

Commit

Permalink
[pfff] switch to 4.01
Browse files Browse the repository at this point in the history
Summary:
Mathieu clang plugins uses some recent OCaml extensions (ambiguous fields)
and I want to interface with his code, so I need to bump the compiler
we use on our devbox.

Test Plan:
./configure
make

Reviewers: mathieubaudet, avik, pieter

Subscribers: jwatzman

Differential Revision: https://phabricator.fb.com/D1396163
  • Loading branch information
pad committed Jun 23, 2014
1 parent 78d1a47 commit 4c99951
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 18 deletions.
7 changes: 3 additions & 4 deletions env.sh
Expand Up @@ -9,10 +9,9 @@ fi
echo setting OPAM
#eval `~pad/packages/Linux/bin/opam config env` does not work, it expands
# to /home/pieter/.opam/... when done by another user => inlined here
#There are issues with 4.01 with ocsigen, js_of_ocaml, and ocamlnet
# so let's go back to 4.00.1 for now
export PATH=/home/pad/.opam/system/bin:/home/pad/packages/sbin:/home/pad/packages/bin:/home/pad/bin:/usr/kerberos/bin:/opt/local/bin:/usr/local/bin:/bin:/usr/bin:/usr/facebook/ops/scripts:/usr/facebook/scripts:/usr/facebook/scripts:/usr/facebook/scripts/db:/usr/local/sbin:/usr/sbin:/sbin:/mnt/vol/engshare/svnroot/tfb/trunk/www/scripts/bin:/mnt/vol/engshare/admin/scripts/hg:/mnt/vol/engshare/admin/scripts/git:/mnt/vol/engshare/admin/scripts:/home/pad/www/scripts/bin:/home/pad/packages/Linux/bin
export CAML_LD_LIBRARY_PATH=/home/pad/.opam/system/lib/stublibs
OPAM=4.01
export PATH=/home/pad/.opam/$OPAM/bin:/home/pad/packages/sbin:/home/pad/packages/bin:/home/pad/bin:/usr/kerberos/bin:/opt/local/bin:/usr/local/bin:/bin:/usr/bin:/usr/facebook/ops/scripts:/usr/facebook/scripts:/usr/facebook/scripts:/usr/facebook/scripts/db:/usr/local/sbin:/usr/sbin:/sbin:/mnt/vol/engshare/svnroot/tfb/trunk/www/scripts/bin:/mnt/vol/engshare/admin/scripts/hg:/mnt/vol/engshare/admin/scripts/git:/mnt/vol/engshare/admin/scripts:/home/pad/www/scripts/bin:/home/pad/packages/Linux/bin
export CAML_LD_LIBRARY_PATH=/home/pad/.opam/$OPAM/lib/stublibs

# for exception stack traces
echo setting OCAMLRUNPARAM
Expand Down
13 changes: 1 addition & 12 deletions external/ptrees/Makefile
Expand Up @@ -32,7 +32,6 @@ MODULES=ptmap.ml ptset.ml
MODULE_INTERFACES=ptmap.mli ptset.mli

.PHONY : all clean cleanall cleandoc doc install remove
.DELETE_ON_ERROR:.depend

all:ptrees.cma
all.opt: ptrees.cmxa
Expand All @@ -58,19 +57,9 @@ ptrees.cmxa:$(MODULES:.ml=.cmx)

# Clean up
clean:
$(RM) *.o *.a *.cm[iox] *~ *.annot .depend
cleanall:clean
$(RM) *.cma *.cmxa
$(RM) *.o *.a *.cm[iox] *~ *.annot .depend *.cma *.cmxa

depend:
$(OCAMLDEP) $(MODULE_INTERFACES) $(MODULES) > .depend

# Dependencies
.depend: $(MODULE_INTERFACES) $(MODULES)
$(OCAMLDEP) $(MODULE_INTERFACES) $(MODULES) > $@

ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),cleanall)
-include .depend
endif
endif
4 changes: 2 additions & 2 deletions skip_list.txt
Expand Up @@ -50,8 +50,8 @@ file: external/ocamlgraph/src/util.mli
file: facebook/external/archimedes/src/utils.ml

#huge
file: facebook/clang/clang_graphcode_j.ml
dir: facebook/clang
file: facebook/clang/clang_callgraph_j.ml
#dir: facebook/clang

# -------------------------------------------------------------------------
# old/
Expand Down

0 comments on commit 4c99951

Please sign in to comment.