mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-15 03:00:30 +00:00
replacing OS_CXXFLAGS with CXXFLAGS so that they get picked up
r=cls@seawood.org # 118126
This commit is contained in:
parent
946661a434
commit
bc7bf0f82f
@ -74,7 +74,7 @@ ifeq ($(OS_TEST),i86pc)
|
||||
CPPSRCS := xptcinvoke_x86_solaris.cpp xptcstubs_x86_solaris.cpp
|
||||
# 28817: if Solaris Intel OS, and native compiler, always build optimised.
|
||||
ifndef GNU_CC
|
||||
OS_CXXFLAGS += -O
|
||||
CXXFLAGS += -O
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -112,7 +112,7 @@ endif
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
ifneq (,$(filter arm32 armv4l sa110,$(OS_TEST)))
|
||||
CPPSRCS := xptcinvoke_arm.cpp xptcstubs_arm.cpp
|
||||
OS_CXXFLAGS += -O2
|
||||
CXXFLAGS += -O2
|
||||
endif
|
||||
endif
|
||||
#
|
||||
@ -137,7 +137,7 @@ CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp
|
||||
ASFILES := xptcstubs_asm_pa32.s xptcinvoke_asm_pa32.s
|
||||
|
||||
# #18875 Building the CPP's (CXX) optimized causes a crash
|
||||
OS_CXXFLAGS := $(filter-out -O, $(OS_CXXFLAGS))
|
||||
CXXFLAGS := $(filter-out -O, $(CXXFLAGS))
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -175,7 +175,7 @@ ASFILES := xptcinvoke_asm_irix.s xptcstubs_asm_irix.s
|
||||
ifdef GNU_CC
|
||||
ASFLAGS += -Wa,-D__GNUC__
|
||||
else
|
||||
OS_CXXFLAGS := $(shell echo $(OS_CXXFLAGS) | sed 's/-O\(3|fast\)/-O2/g')
|
||||
CXXFLAGS := $(shell echo $(CXXFLAGS) | sed 's/-O\(3|fast\)/-O2/g')
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -203,7 +203,7 @@ CPPSRCS := xptcinvoke_ppc_aix.cpp xptcstubs_ppc_aix.cpp
|
||||
ASFILES := xptcinvoke_asm_ppc_aix.s xptcstubs_asm_ppc_aix.s
|
||||
|
||||
# #24617 Building the CPP's (CXX) optimized causes a crash
|
||||
OS_CXXFLAGS := $(filter-out -O, $(OS_CXXFLAGS))
|
||||
CXXFLAGS := $(filter-out -O, $(CXXFLAGS))
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
|
||||
|
Loading…
Reference in New Issue
Block a user