From 3a742ae3f2ff50ff92e3a16beb899846eb11790c Mon Sep 17 00:00:00 2001 From: Andrew Tonner Date: Sun, 22 Jan 2017 23:26:36 -0800 Subject: [PATCH] python build script: symlink m4 dir before autogen that requires it --- SheepShaver/src/Windows/build_on_msys.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SheepShaver/src/Windows/build_on_msys.py b/SheepShaver/src/Windows/build_on_msys.py index 70e55969..dda9e1e5 100644 --- a/SheepShaver/src/Windows/build_on_msys.py +++ b/SheepShaver/src/Windows/build_on_msys.py @@ -304,11 +304,6 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit unix_dir = os.path.join(sheepshaver_dir, "src", "Unix") - with dep_tracker.rebuilding_if_needed("sheepshaver_autogen", ["configure.ac"], - base_dir=script_path) as needs_rebuild: - if needs_rebuild: - run([msys_bash, os.path.join(unix_dir, "autogen.sh")], cwd=script_path, env=autogen_env) - ln_cmd = os.path.join(msys_bin_dir, "ln.exe") windows_m4_dir = os.path.join(script_path, "m4") @@ -316,6 +311,11 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit run([ln_cmd, "-sf", os.path.join(unix_dir, "m4"), windows_m4_dir], cwd=script_path, env=autogen_env) + with dep_tracker.rebuilding_if_needed("sheepshaver_autogen", ["configure.ac"], + base_dir=script_path) as needs_rebuild: + if needs_rebuild: + run([msys_bash, os.path.join(unix_dir, "autogen.sh")], cwd=script_path, env=autogen_env) + configure_macemu_env = dict(our_env) configure_macemu_env["CC"] = "gcc %s" % MACEMU_CFLAGS configure_macemu_env["CXX"] = "g++ %s" % MACEMU_CXXFLAGS