diff --git a/build/makefile_base.mak b/build/makefile_base.mak index a13c9f10..10bfa88b 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -837,7 +837,7 @@ $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64) $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 vkd3d64 $(WINE_OBJ64) bison64 cd $(dir $@) && \ STRIP=$(STRIP_QUOTED) \ - BISON=$(abspath $(BISON_BIN64)) \ + PATH="$(dir $(abspath $(BISON_BIN64))):$(PATH)" \ CFLAGS="-I$(abspath $(TOOLS_DIR64))/include -g $(COMMON_FLAGS)" \ CXXFLAGS="-I$(abspath $(TOOLS_DIR64))/include -g $(COMMON_FLAGS) -std=c++17" \ LDFLAGS=-L$(abspath $(TOOLS_DIR64))/lib \ @@ -854,7 +854,7 @@ $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 vkd3d32 $(WINE_OBJ32) bison32 cd $(dir $@) && \ STRIP=$(STRIP_QUOTED) \ - BISON=$(abspath $(BISON_BIN32)) \ + PATH="$(dir $(abspath $(BISON_BIN32))):$(PATH)" \ CFLAGS="-I$(abspath $(TOOLS_DIR32))/include -g $(COMMON_FLAGS)" \ CXXFLAGS="-I$(abspath $(TOOLS_DIR32))/include -g $(COMMON_FLAGS) -std=c++17" \ LDFLAGS=-L$(abspath $(TOOLS_DIR32))/lib \ @@ -891,7 +891,7 @@ $(WINE_BUILDTOOLS64) $(WINE_OUT) wine64: wine64-intermediate wine64-intermediate: SHELL = $(CONTAINER_SHELL64) wine64-intermediate: $(WINE_CONFIGURE_FILES64) - +$(MAKE) -C $(WINE_OBJ64) $(WINE_COMMON_MAKE_ARGS) + +PATH="$(dir $(abspath $(BISON_BIN64))):$(PATH)" $(MAKE) -C $(WINE_OBJ64) $(WINE_COMMON_MAKE_ARGS) +$(MAKE) -C $(WINE_OBJ64) $(WINE_COMMON_MAKE_ARGS) install-lib +$(MAKE) -C $(WINE_OBJ64) $(WINE64_MAKE_ARGS) install-lib install-dev if [ "$(UNSTRIPPED_BUILD)" == "" ]; then rm -rf $(DST_DIR)/lib64/wine/.debug; fi @@ -905,7 +905,7 @@ $(WINE_BUILDTOOLS32) wine32: wine32-intermediate wine32-intermediate: SHELL = $(CONTAINER_SHELL32) wine32-intermediate: $(WINE_CONFIGURE_FILES32) - +$(MAKE) -C $(WINE_OBJ32) $(WINE_COMMON_MAKE_ARGS) + +PATH="$(dir $(abspath $(BISON_BIN32))):$(PATH)" $(MAKE) -C $(WINE_OBJ32) $(WINE_COMMON_MAKE_ARGS) +$(MAKE) -C $(WINE_OBJ32) $(WINE_COMMON_MAKE_ARGS) install-lib +$(MAKE) -C $(WINE_OBJ32) $(WINE32_MAKE_ARGS) install-lib install-dev mkdir -p $(DST_DIR)/{lib,bin}