summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-05-10 10:32:31 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-06-21 09:14:23 +0200
commit7f3142fc5c57a741c61c7df9747e7148e7fdd8f6 (patch)
treeee96f1f57b64b502523744dda34c3ce423248710
parenta686dbfaa43cd13a252de59572cf10631332eb51 (diff)
downloadrockbox-7f3142fc5c57a741c61c7df9747e7148e7fdd8f6.tar.gz
rockbox-7f3142fc5c57a741c61c7df9747e7148e7fdd8f6.tar.bz2
rockbox-7f3142fc5c57a741c61c7df9747e7148e7fdd8f6.zip
rbutil: Fix compiling 32bit Rockbox Utility on 64bit Linux.
Pass the machine options for libs to the c++ compiler as well. Change-Id: I56bfbbe4aca4b3a7b86bb0d5323a1f7d78d4f60c
-rw-r--r--rbutil/rbutilqt/Makefile.libs1
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro3
2 files changed, 3 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs
index 24fe85e269..6d5c8c5354 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/rbutil/rbutilqt/Makefile.libs
@@ -28,6 +28,7 @@ export SYS_SPEEX
export TARGET_DIR
export RBBASE_DIR
export CFLAGS=$(EXTRALIB_CFLAGS)
+export CXXFLAGS=$(EXTRALIB_CXXFLAGS)
export CC=$(EXTRALIBS_CC)
export CXX=$(EXTRALIBS_CXX)
export AR=$(EXTRALIBS_AR)
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index a845c3ca36..f51d3608b3 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -33,7 +33,8 @@ unix:!mac:!noccache {
MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42])
EXTRALIBS_OPTS += EXTRALIBS_CC=\"$$QMAKE_CC\"
EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\"
-EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" \
+EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\"
+EXTRALIBS_OPTS += EXTRALIB_CXXFLAGS=\"$$MACHINEFLAGS\"
MYBUILDDIR = $$OUT_PWD/build/
MYLIBBUILDDIR = $$MYBUILDDIR/libs/