зеркало из https://github.com/mozilla/gecko-dev.git
Do not use IRIX native compiler options such as -n32 when NS_USE_GCC is
defined. Modified files: config/Makefile.in, pr/tests/Makefile.in
This commit is contained in:
Родитель
768f2af838
Коммит
c7cf47414c
|
@ -75,9 +75,8 @@ endif
|
|||
ifeq ($(OS_ARCH), IRIX)
|
||||
ifeq ($(basename $(OS_RELEASE)),6)
|
||||
ifeq ($(USE_N32),1)
|
||||
ifndef NS_USE_GCC
|
||||
XLDOPTS += -n32 -Wl,-woff,85
|
||||
ifeq ($(OS_RELEASE), 6_2)
|
||||
XLDOPTS += -Wl,-woff,85
|
||||
endif
|
||||
else
|
||||
ifeq ($(USE_64),1)
|
||||
|
|
|
@ -254,13 +254,18 @@ ifeq ($(OS_ARCH), IRIX)
|
|||
ifeq ($(USE_CPLUS), 1)
|
||||
CC = CC
|
||||
endif
|
||||
LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) -rdata_shared
|
||||
LDOPTS += -rpath $(ABSOLUTE_LIB_DIR)
|
||||
ifndef NS_USE_GCC
|
||||
LDOPTS += -rdata_shared
|
||||
endif
|
||||
# For 6.x machines, include this flag
|
||||
ifeq ($(basename $(OS_RELEASE)),6)
|
||||
ifeq ($(USE_N32),1)
|
||||
LDOPTS += -n32
|
||||
else
|
||||
LDOPTS += -32
|
||||
ifndef NS_USE_GCC
|
||||
ifeq ($(USE_N32),1)
|
||||
LDOPTS += -n32
|
||||
else
|
||||
LDOPTS += -32
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(USE_PTHREADS), 1)
|
||||
|
|
Загрузка…
Ссылка в новой задаче