Skip to content

Merge build systems in the tools subdirectory#812

Merged
alainfrisch merged 1 commit intoocaml:trunkfrom
shindere:merge-tools-makefiles
Sep 16, 2016
Merged

Merge build systems in the tools subdirectory#812
alainfrisch merged 1 commit intoocaml:trunkfrom
shindere:merge-tools-makefiles

Conversation

@shindere
Copy link
Contributor

Same line than PR #808 & co, see commit message for details.

@shindere shindere force-pushed the merge-tools-makefiles branch 3 times, most recently from 73f44c6 to d8970c1 Compare September 15, 2016 08:24
shindere added a commit to shindere/ocaml that referenced this pull request Sep 15, 2016
In essence, this commit does three things:

1. Move the content of Makefile.shared to the main Makefile

2. Modify the include directive in Makefile.nt accordingly

3. Move the Windows-specific definition of CAMLOPT from Makefile.nt
to Makefile and make sure it is evaluated only under Windows.
In essence, this commit does three things:

1. Move the content of Makefile.shared to the main Makefile

2. Modify the include directive in Makefile.nt accordingly

3. Move the Windows-specific definition of CAMLOPT from Makefile.nt
to Makefile and make sure it is evaluated only under Windows.
@shindere shindere force-pushed the merge-tools-makefiles branch from d8970c1 to 84edfdb Compare September 15, 2016 14:28
Copy link
Contributor

@alainfrisch alainfrisch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. (Checked with git diff HEAD~1:tools/Makefile.shared HEAD:tools/Makefile that no spurious change was introduced during the operation.)

@alainfrisch alainfrisch merged commit f642ba7 into ocaml:trunk Sep 16, 2016
@shindere shindere deleted the merge-tools-makefiles branch September 19, 2016 09:59
camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017
In essence, this commit does three things:

1. Move the content of Makefile.shared to the main Makefile

2. Modify the include directive in Makefile.nt accordingly

3. Move the Windows-specific definition of CAMLOPT from Makefile.nt
to Makefile and make sure it is evaluated only under Windows.
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Sep 21, 2022
* Check for [Config.stack_allocation] during selection of [Ctrywith].

* Duplicate changes to ocaml/asmcomp
sadiqj pushed a commit to sadiqj/ocaml that referenced this pull request Feb 21, 2023
…enabled (ocaml#812)

* Check for [Config.stack_allocation] during selection of [Ctrywith].

* Duplicate changes to ocaml/asmcomp
stedolan pushed a commit to stedolan/ocaml that referenced this pull request Mar 21, 2023
25188da flambda-backend: Missed comment from PR802 (ocaml#887)
9469765 flambda-backend: Improve the semantics of asynchronous exceptions (new simpler version) (ocaml#802)
d9e4dd0 flambda-backend: Fix `make runtest` on NixOS (ocaml#874)
4bbde7a flambda-backend: Simpler symbols (ocaml#753)
ef37262 flambda-backend: Add opaqueness to Obj.magic under Flambda 2 (ocaml#862)
a9616e9 flambda-backend: Add build system hooks for ocaml-jst (ocaml#869)
045ef67 flambda-backend: Allow the compiler to build with stock Dune (ocaml#868)
3cac5be flambda-backend: Simplify Makefile logic for natdynlinkops (ocaml#866)
c5b12bf flambda-backend: Remove unnecessary install lines (ocaml#860)
ff12bbe flambda-backend: Fix unused variable warning in st_stubs.c (ocaml#861)
c84976c flambda-backend: Static check for noalloc: attributes (ocaml#825)
ca56052 flambda-backend: Build system refactoring for ocaml-jst (ocaml#857)
39eb7f9 flambda-backend: Remove integer comparison involving nonconstant polymorphic variants (ocaml#854)
c102688 flambda-backend: Fix soundness bug by using currying information from typing (ocaml#850)
6a96b61 flambda-backend: Add a primitive to enable/disable the tick thread (ocaml#852)
f64370b flambda-backend: Make Obj.dup use a new primitive, %obj_dup (ocaml#843)
9b78eb2 flambda-backend: Add test for ocaml#820 (include functor soundness bug) (ocaml#841)
8f24346 flambda-backend: Add `-dtimings-precision` flag (ocaml#833)
65c2f22 flambda-backend: Add test for ocaml#829 (ocaml#831)
7b27a49 flambda-backend: Follow-up PR#829 (comballoc fixes for locals) (ocaml#830)
ad7ec10 flambda-backend: Use a custom condition variable implementation (ocaml#787)
3ee650c flambda-backend: Fix soundness bug in include functor (ocaml#820)
2f57378 flambda-backend: Static check noalloc (ocaml#778)
aaad625 flambda-backend: Emit begin/end region only when stack allocation is enabled (ocaml#812)
17c7173 flambda-backend: Fix .cmt for included signatures (ocaml#803)
e119669 flambda-backend: Increase delays in tests/lib-threads/beat.ml (ocaml#800)
ccc356d flambda-backend: Prevent dynamic loading of the same .cmxs twice in private mode, etc. (ocaml#784)
14eb572 flambda-backend: Make local extension point equivalent to local_ expression (ocaml#790)
487d11b flambda-backend: Fix tast_iterator and tast_mapper for include functor. (ocaml#795)
a50a818 flambda-backend: Reduce closure allocation in List (ocaml#792)
96c9c60 flambda-backend: Merge ocaml-jst
a775b88 flambda-backend: Fix ocaml/otherlibs/unix 32-bit build (ocaml#767)
f7c2679 flambda-backend: Create object files internally to avoid invoking GAS (ocaml#757)
c7a46bb flambda-backend: Bugfix for Cmmgen.expr_size with locals (ocaml#756)
b337cb6 flambda-backend: Fix build_upstream for PR749 (ocaml#750)
8e7e81c flambda-backend: Differentiate is_int primitive between generic and variant-only versions (ocaml#749)

git-subtree-dir: ocaml
git-subtree-split: 25188da
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants