diff options
| author | Rémi Bernon <rbernon@codeweavers.com> | 2021-01-12 17:52:25 +0300 |
|---|---|---|
| committer | Andrew Eikum <aeikum@codeweavers.com> | 2021-02-05 17:28:09 +0300 |
| commit | de58187e6c8d11a296e57402aabc5251de3ff7df (patch) | |
| tree | 0d1f55534496f7ed87f2f66615c17e91d38d960b | |
| parent | 433e98c22db3745ac02baa4860cd7bc9589a0732 (diff) | |
build: Also pass CXX override to wine configure.
So that it is correctly embedded into wineg++.
| -rw-r--r-- | build/makefile_base.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 9d3667b8..91f8673c 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -161,6 +161,7 @@ STRIP_QUOTED = $(call QUOTE,$(STRIP)) CC_QUOTED = $(call QUOTE,$(CC)) CC32_QUOTED = $(call QUOTE,$(CC32)) CXX_QUOTED = $(call QUOTE,$(CXX)) +CXX32_QUOTED = $(call QUOTE,$(CXX32)) CROSSCC32_QUOTED = $(call QUOTE,$(CROSSCC32)) CROSSCC64_QUOTED = $(call QUOTE,$(CROSSCC64)) @@ -1238,6 +1239,7 @@ $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 jxrlib64 gst_base64 $(WINE PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \ JXRLIB_CFLAGS=-I$(abspath $(TOOLS_DIR64))/include/jxrlib \ CC=$(CC_QUOTED) \ + CXX=$(CXX_QUOTED) \ CROSSCC=$(CROSSCC64_QUOTED) \ CROSSDEBUG=split-dwarf @@ -1257,6 +1259,7 @@ $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 jxrlib32 gst_base32 $(WINE PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ JXRLIB_CFLAGS=-I$(abspath $(TOOLS_DIR32))/include/jxrlib \ CC=$(CC32_QUOTED) \ + CXX=$(CXX32_QUOTED) \ CROSSCC=$(CROSSCC32_QUOTED) \ PKG_CONFIG="$(PKG_CONFIG32)" \ CROSSDEBUG=split-dwarf |