# HG changeset patch # User Mike Becker # Date 1695313477 -7200 # Node ID b8d06f7b617c9498134176fa8ee2d673d9eeaa91 # Parent d79fc765fd4a61a32669f8237deaba41ff2cbf76 fix vars.mk never appended to config.mk diff -r d79fc765fd4a -r b8d06f7b617c src/test/resources/golden-sample/configure --- 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" diff -r d79fc765fd4a -r b8d06f7b617c src/test/resources/golden-sample/configure2 --- 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" diff -r d79fc765fd4a -r b8d06f7b617c test/configure --- 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" diff -r d79fc765fd4a -r b8d06f7b617c test/make/configure.vm --- 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"