Skip to content

Add /testsuite/tools/Makefile and allow to use Flambda 2 libs (and fix .gitignore) #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2021

Conversation

mshinwell
Copy link
Collaborator

This adds a local copy of the Makefile for the upstream testsuite's tools directory, which we currently have a partial copy of at the root. Then the Flambda 2 libraries are added to the linker invocations for these tools. Without this, Compilenv will fail to link, after PR#108.

During development of this patch it was noticed that .gitignore is incorrectly matching files in subdirectories for certain patterns, which is fixed here, enabling the new Makefile to be added to git.

@mshinwell mshinwell added the flambda2 Prerequisite for, or part of, flambda2 label Jul 26, 2021
@xclerc
Copy link
Contributor

xclerc commented Jul 26, 2021

(Review note: the only change between the original and the new
Makefile is the definition of codegen_LIBS, which now include
flambda2 libraries.)

It feels like the definitions of the expect_OCAMLFLAGS and
codegen_OCAMLFLAGS might need to be updated because
the entries in (respectively) expect_DIRS and expect_DIRS
do not represent subdirectories of TOPDIR.

@xclerc
Copy link
Contributor

xclerc commented Jul 26, 2021

If the previous comment has some truth in it, COMPILERLIBSDIR
may also need to be updated.

@xclerc
Copy link
Contributor

xclerc commented Jul 26, 2021

As point out by @mshinwell "offline", the two previous comments are wrong
because the Makefile will be interpreted in ./_runtest, which will be specially
set up and will contain the various subdirectories.

@mshinwell mshinwell merged commit 9b5f9d8 into oxcaml:main Jul 26, 2021
mshinwell added a commit to mshinwell/oxcaml that referenced this pull request Aug 4, 2021
…x .gitignore) (oxcaml#109)

* Add testsuite/tools/Makefile

* Allow testsuite/tools to use Flambda 2 libs
riaqn added a commit to riaqn/flambda-backend that referenced this pull request Feb 23, 2023
c703f5f Incorporate upstream comments into type-variable refactor (oxcaml#121)
362ba23 Constrain curry modes to increase along applications (oxcaml#108)
b1f0cf9 Simplify the extension handling (oxcaml#114)
4fd53a1 Remove pat_mode from typedtree (oxcaml#105)
cf6fcbc Handle attributes on lambdas with locally abstract types (oxcaml#120)
5fa80fe Don't track attributes inside attributes for warning 53 (oxcaml#115)
8a69777 Handle unclosed `[: ... :]` patterns (via `Generic_array` machinery) (oxcaml#117)
b0737f4 Add promote-one Makefile target (oxcaml#118)
c6ad684 Refactoring and fixes around module lookup (oxcaml#107)
b0a6495 Add documentation for global constructor arguments (oxcaml#69)
dd79aec Print `nlocal` in the `-d(raw)lambda` output (oxcaml#112)
8035026 Fix `nlocal` in the generated Lambda for list comprehensions (oxcaml#113)
afbcdf0 Immutable arrays (oxcaml#47)
bfe1490 fix several issues when removing exp_mode (oxcaml#110)
8f46060 Better error message for under-applied functions (oxcaml#74)
27331d8 Consistently use Lmutvar or Lvar in comprehensions (oxcaml#111)
01e965b Skip failing test for now
0131357 Fix test case to use comprehensions_experimental
22a7368 Temporarily disable list comprehensions tests due to locals bug
e08377d Make `comprehensions` into `comprehensions_experimental` for now (oxcaml#109)
947cf89 List and array comprehensions (oxcaml#46)
bd9e051 remove exp_mode from typedtree (oxcaml#100)
a9268d2 Fix misplaced attribute warning when using external parser (and some cleanup) (oxcaml#101)
2b33f24 Refactor toplevel local escape check (oxcaml#104)
ed2aec6 Comment functions exported from TyVarEnv.
87838ba Move new variable creation into TyVarEnv.
a3f60ab Encapsulate functions that work with tyvars
43d83a6 Prevent possibility of forgetting to re-widen
2f3dd34 Encapsulate context when narrowing type env't
d78ff6d Make immediate64 things mode cross (oxcaml#97)
aa25ab9 Fix version number (oxcaml#94)
d01ffa0 Fix .depend file (oxcaml#93)
942f2ab Bootstrap (oxcaml#92)
05f7e38 Check Menhir version (oxcaml#91)
1569b58 Move the CI jobs from 4.12 to 4.14. (oxcaml#90)

git-subtree-dir: ocaml
git-subtree-split: c703f5f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flambda2 Prerequisite for, or part of, flambda2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants