devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Only pass AR to extralibs Makefile if the compiler is gcc.

Browse source 
We need this only for cross compiling. Trying to figure the compiler prefix
fails if the compiler isn't gcc (i.e. clang), and we only support gcc when
cross compiling.

Change-Id: I822e1b47ec7e9d7e9fdeae8ccf3b8d417a472ef9
This commit is contained in:
Dominik Riebeling 2013-05-09 17:23:42 +02:00
parent 9e9f692678
commit f7d8b2db93
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rbutil/rbutilqt/rbutilqt.pro
View file

@ -70,7 +70,9 @@ message("Rockbox Base dir: "$$RBBASE_DIR)
# the ar that matches the current gcc. Since qmake doesn't provide a variable
# holding the correct ar without any additions we need to figure it ourselves
# here. This assumes that QMAKE_CC will always be "gcc", maybe with a postfix.
MYAR = $$replace(QMAKE_CC,gcc.*,ar)
contains(QMAKE_CC, gcc) {
EXTRALIBS_MYAR = "EXTRALIBS_AR="$$replace(QMAKE_CC,gcc.*,ar)
}
extralibs.commands = $$SILENT \
$(MAKE) -f $$RBBASE_DIR/rbutil/rbutilqt/Makefile.libs \
@ -81,7 +83,7 @@ extralibs.commands = $$SILENT \
RBBASE_DIR=$$RBBASE_DIR \
EXTRALIBS_CC=\"$$QMAKE_CC\" \
EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" \
EXTRALIBS_AR=\"$$MYAR\" \
$$EXTRALIBS_MYAR \
libs
# Note: order is important for RBLIBS! The libs are appended to the linker
# flags in this order, put libucl at the end.