suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Also pass CXX override to wine configure.

Browse source 
So that it is correctly embedded into wineg++.
This commit is contained in:
Rémi Bernon 2021-01-12 15:52:25 +01:00 committed by Andrew Eikum
parent 433e98c22d
commit de58187e6c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/makefile_base.mak
View file

@ -161,6 +161,7 @@ STRIP_QUOTED = $(call QUOTE,$(STRIP))
CC_QUOTED = $(call QUOTE,$(CC)) CC_QUOTED = $(call QUOTE,$(CC))
CC32_QUOTED = $(call QUOTE,$(CC32)) CC32_QUOTED = $(call QUOTE,$(CC32))
CXX_QUOTED = $(call QUOTE,$(CXX)) CXX_QUOTED = $(call QUOTE,$(CXX))
CXX32_QUOTED = $(call QUOTE,$(CXX32))
CROSSCC32_QUOTED = $(call QUOTE,$(CROSSCC32)) CROSSCC32_QUOTED = $(call QUOTE,$(CROSSCC32))
CROSSCC64_QUOTED = $(call QUOTE,$(CROSSCC64)) 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 \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \
JXRLIB_CFLAGS=-I$(abspath $(TOOLS_DIR64))/include/jxrlib \ JXRLIB_CFLAGS=-I$(abspath $(TOOLS_DIR64))/include/jxrlib \
CC=$(CC_QUOTED) \ CC=$(CC_QUOTED) \
CXX=$(CXX_QUOTED) \
CROSSCC=$(CROSSCC64_QUOTED) \ CROSSCC=$(CROSSCC64_QUOTED) \
CROSSDEBUG=split-dwarf 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 \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \
JXRLIB_CFLAGS=-I$(abspath $(TOOLS_DIR32))/include/jxrlib \ JXRLIB_CFLAGS=-I$(abspath $(TOOLS_DIR32))/include/jxrlib \
CC=$(CC32_QUOTED) \ CC=$(CC32_QUOTED) \
CXX=$(CXX32_QUOTED) \
CROSSCC=$(CROSSCC32_QUOTED) \ CROSSCC=$(CROSSCC32_QUOTED) \
PKG_CONFIG="$(PKG_CONFIG32)" \ PKG_CONFIG="$(PKG_CONFIG32)" \
CROSSDEBUG=split-dwarf CROSSDEBUG=split-dwarf