Mercurial > hg > uwproj / changeset

--- a/src/test/resources/golden-sample/configure	Thu Sep 21 18:22:07 2023 +0200
+++ b/src/test/resources/golden-sample/configure	Thu Sep 21 18:24:37 2023 +0200
@@ -476,8 +476,8 @@
 #
 
 __EOF__
-write_toolchain_defaults "$TEMP_DIR/config.mk"
-cat "$TEMP_DIR/config.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
+write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
+cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
 rm -Rf "$TEMP_DIR"
 
 

--- a/src/test/resources/golden-sample/configure2	Thu Sep 21 18:22:07 2023 +0200
+++ b/src/test/resources/golden-sample/configure2	Thu Sep 21 18:24:37 2023 +0200
@@ -738,8 +738,8 @@
 #
 
 __EOF__
-write_toolchain_defaults "$TEMP_DIR/config.mk"
-cat "$TEMP_DIR/config.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
+write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
+cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
 rm -Rf "$TEMP_DIR"
 
 

--- a/test/configure	Thu Sep 21 18:22:07 2023 +0200
+++ b/test/configure	Thu Sep 21 18:24:37 2023 +0200
@@ -476,8 +476,8 @@
 #
 
 __EOF__
-write_toolchain_defaults "$TEMP_DIR/config.mk"
-cat "$TEMP_DIR/config.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
+write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
+cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
 rm -Rf "$TEMP_DIR"
 
 

--- a/test/make/configure.vm	Thu Sep 21 18:22:07 2023 +0200
+++ b/test/make/configure.vm	Thu Sep 21 18:24:37 2023 +0200
@@ -589,8 +589,8 @@
 #
 
 __EOF__
-write_toolchain_defaults "$TEMP_DIR/config.mk"
-cat "$TEMP_DIR/config.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
+write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
+cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
 rm -Rf "$TEMP_DIR"