Moved optimization filtering so that OS_CFLAGS doesn't get evaluated prematurely.
git-svn-id: svn://10.0.0.236/trunk@22481 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
1780b536cd
commit
c7bff4d0a0
@ -60,7 +60,12 @@ MOZ_BUILD_XPFE = @MOZ_BUILD_XPFE@
|
||||
MOZ_BUILD_NSPR = @MOZ_BUILD_NSPR@
|
||||
|
||||
# Should the extra CFLAGS only be added in Makefile.ins that need them?
|
||||
ifdef MOZ_DEBUG
|
||||
OS_CFLAGS = $(filter-out -O%, @CFLAGS@) $(DSO_CFLAGS)
|
||||
else
|
||||
OS_CFLAGS = @CFLAGS@ $(DSO_CFLAGS)
|
||||
endif
|
||||
|
||||
OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
|
||||
OS_LIBS = @LDFLAGS@ @LIBS@
|
||||
AC_DEFINES = @DEFS@
|
||||
@ -156,10 +161,6 @@ LIBS_PATH = @LIBS_PATH@
|
||||
|
||||
COMPILER_DEPEND = @COMPILER_DEPEND@
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
OS_CFLAGS := $(filter-out -O%, $(OS_CFLAGS))
|
||||
endif
|
||||
|
||||
# Pulled these out of configure.in,
|
||||
# so undefine them now instead of subst
|
||||
MOZ_NETCAST =
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user