Update target config after init macros (#11985)

* Update target config after init macros * [tests] add test
HaxeFoundation · Feb 10, 2025 · 0ee1a66 · 0ee1a66
1 parent 9d32634
commit 0ee1a66
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/src/compiler/compiler.ml b/src/compiler/compiler.ml
@@ -296,6 +296,7 @@ let do_type ctx mctx actx display_file_dot_path =
 		Some (MacroContext.call_init_macro ctx.com mctx path)
 	) mctx (List.rev actx.config_macros) in
 	enter_stage com CInitMacrosDone;
+	update_platform_config com; (* make sure to adapt all flags changes defined during init macros *)
 	ServerMessage.compiler_stage com;
 
 	let macros = match mctx with None -> None | Some mctx -> mctx.g.macros in

diff --git a/tests/misc/js/projects/Issue11985/.gitignore b/tests/misc/js/projects/Issue11985/.gitignore
@@ -0,0 +1 @@
+test.js
diff --git a/tests/misc/js/projects/Issue11985/Macro.hx b/tests/misc/js/projects/Issue11985/Macro.hx
@@ -0,0 +1,3 @@
+function init() {
+	haxe.macro.Compiler.define("js-unflatten", "1");
+}
diff --git a/tests/misc/js/projects/Issue11985/Main.hx b/tests/misc/js/projects/Issue11985/Main.hx
@@ -0,0 +1,4 @@
+function main() {
+	haxe.Log.trace("hello");
+	var haxe = "haxe";
+}
diff --git a/tests/misc/js/projects/Issue11985/compile.hxml b/tests/misc/js/projects/Issue11985/compile.hxml
@@ -0,0 +1,4 @@
+-main Main
+--macro Macro.init()
+-js test.js
+-cmd "node test.js"