From bd8efaa9a63310382a92763fd44c9f8cfbabada7 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Mon, 4 Nov 2019 13:52:27 -0600 Subject: [PATCH] build: Build c++ files with -fno-gnu-unique Wine requires dlclose() to be functional, and g++ breaks it by default. This manifested as wined3d failing to load a 2nd time after being unloaded. --- build/makefile_base.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 10bfa88b..40c6bbcc 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -839,7 +839,7 @@ $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 vkd3d64 $(WINE_OBJ64) biso STRIP=$(STRIP_QUOTED) \ 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" \ + CXXFLAGS="-I$(abspath $(TOOLS_DIR64))/include -g $(COMMON_FLAGS) -fno-gnu-unique -std=c++17" \ LDFLAGS=-L$(abspath $(TOOLS_DIR64))/lib \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \ CC=$(CC_QUOTED) \ @@ -856,7 +856,7 @@ $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 vkd3d32 $(WINE_OBJ32) biso STRIP=$(STRIP_QUOTED) \ 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" \ + CXXFLAGS="-I$(abspath $(TOOLS_DIR32))/include -g $(COMMON_FLAGS) -fno-gnu-unique -std=c++17" \ LDFLAGS=-L$(abspath $(TOOLS_DIR32))/lib \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ CC=$(CC_QUOTED) \