mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 917526 - Various duplicate symbol errors building tree with the 10.9 SDK. r=glandium
This commit is contained in:
parent
02cf71a3b2
commit
2048df0a7f
@ -1235,7 +1235,12 @@ dnl ========================================================
|
||||
if test "$GNU_CC"; then
|
||||
# Per bug 719659 comment 2, some of the headers on ancient build machines
|
||||
# may require gnu89 inline semantics. But otherwise, we use C99.
|
||||
CFLAGS="$CFLAGS -std=gnu99 -fgnu89-inline"
|
||||
# But on OS X we just use C99 plus GNU extensions, in order to fix
|
||||
# bug 917526.
|
||||
CFLAGS="$CFLAGS -std=gnu99"
|
||||
if test "${OS_ARCH}" != Darwin; then
|
||||
CFLAGS="$CFLAGS -fgnu89-inline"
|
||||
fi
|
||||
# FIXME: Let us build with strict aliasing. bug 414641.
|
||||
CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(notdir $@) -o $@'
|
||||
|
@ -1061,7 +1061,12 @@ dnl ========================================================
|
||||
if test "$GNU_CC"; then
|
||||
# Per bug 719659 comment 2, some of the headers on ancient build machines
|
||||
# may require gnu89 inline semantics. But otherwise, we use C99.
|
||||
CFLAGS="$CFLAGS -std=gnu99 -fgnu89-inline"
|
||||
# But on OS X we just use C99 plus GNU extensions, in order to fix
|
||||
# bug 917526.
|
||||
CFLAGS="$CFLAGS -std=gnu99"
|
||||
if test "${OS_ARCH}" != Darwin; then
|
||||
CFLAGS="$CFLAGS -fgnu89-inline"
|
||||
fi
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(notdir $@) -o $@'
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(notdir $@) -o $@'
|
||||
DSO_LDOPTS='-shared'
|
||||
|
Loading…
Reference in New Issue
Block a user