зеркало из https://github.com/mozilla/pjs.git
Use -mdynamic-no-pic when building non-PIC code with gcc 3.1 on MacOS 10.2 (bug 165851). r=cls.
This commit is contained in:
Родитель
c153e373b9
Коммит
39ed63d1de
|
@ -412,7 +412,11 @@ endif
|
||||||
|
|
||||||
ifndef _ENABLE_PIC
|
ifndef _ENABLE_PIC
|
||||||
DSO_CFLAGS=
|
DSO_CFLAGS=
|
||||||
|
ifeq ($(OS_ARCH)_$(HAVE_GCC3_ABI),Darwin_1)
|
||||||
|
DSO_PIC_CFLAGS=-mdynamic-no-pic
|
||||||
|
else
|
||||||
DSO_PIC_CFLAGS=
|
DSO_PIC_CFLAGS=
|
||||||
|
endif
|
||||||
MKSHLIB=
|
MKSHLIB=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ endif # WINNT
|
||||||
LOCAL_INCLUDES = -I$(srcdir)/../include
|
LOCAL_INCLUDES = -I$(srcdir)/../include
|
||||||
|
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
|
FORCE_USE_PIC = 1
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,7 @@ EXPORTS = fdlibm.h
|
||||||
# we need to force a static lib for the linking that js/src/Makefile.in wants
|
# we need to force a static lib for the linking that js/src/Makefile.in wants
|
||||||
# to do, and we don't really need a shared library ever, so:
|
# to do, and we don't really need a shared library ever, so:
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
|
FORCE_USE_PIC = 1
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ EXPORTS += \
|
||||||
# we don't want the shared lib, but we want to force the creation of a
|
# we don't want the shared lib, but we want to force the creation of a
|
||||||
# static lib.
|
# static lib.
|
||||||
FORCE_STATIC_LIB=1
|
FORCE_STATIC_LIB=1
|
||||||
|
FORCE_USE_PIC=1
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче