зеркало из https://github.com/mozilla/pjs.git
Bugzilla bug #63815: this AIX compilation problem only occurs in 64-bit
builds. lib/softoken/pkcs11c.c also needs the workaround. Modified files: lib/pk11wrap/Makefile, lib/softoken/Makefile
This commit is contained in:
Родитель
6966fd1e37
Коммит
3009c01f96
|
@ -75,10 +75,11 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||||
export:: private_export
|
export:: private_export
|
||||||
|
|
||||||
# On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
|
# On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
|
||||||
# pk11slot.c for unknown reasons. A workaround is to compile it
|
# pk11slot.c in 64-bit mode for unknown reasons. A workaround is
|
||||||
# with optimizations turned on. (Bugzilla bug #63815)
|
# to compile it with optimizations turned on. (Bugzilla bug #63815)
|
||||||
ifeq ($(OS_ARCH),AIX)
|
ifeq ($(OS_ARCH),AIX)
|
||||||
ifeq ($(OS_RELEASE),4.3)
|
ifeq ($(OS_RELEASE),4.3)
|
||||||
|
ifeq ($(USE_64),1)
|
||||||
ifndef BUILD_OPT
|
ifndef BUILD_OPT
|
||||||
$(OBJDIR)/pk11slot.o: pk11slot.c
|
$(OBJDIR)/pk11slot.o: pk11slot.c
|
||||||
@$(MAKE_OBJDIR)
|
@$(MAKE_OBJDIR)
|
||||||
|
@ -86,3 +87,4 @@ $(OBJDIR)/pk11slot.o: pk11slot.c
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -74,4 +74,17 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||||
|
|
||||||
export:: private_export
|
export:: private_export
|
||||||
|
|
||||||
|
# On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
|
||||||
|
# pkcs11c.c in 64-bit mode for unknown reasons. A workaround is
|
||||||
|
# to compile it with optimizations turned on. (Bugzilla bug #63815)
|
||||||
|
ifeq ($(OS_ARCH),AIX)
|
||||||
|
ifeq ($(OS_RELEASE),4.3)
|
||||||
|
ifeq ($(USE_64),1)
|
||||||
|
ifndef BUILD_OPT
|
||||||
|
$(OBJDIR)/pkcs11c.o: pkcs11c.c
|
||||||
|
@$(MAKE_OBJDIR)
|
||||||
|
$(CC) -o $@ -c -O2 $(CFLAGS) $<
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче