зеркало из https://github.com/mozilla/gecko-dev.git
Fix specifically for NetBSD/alpha builds. Won't affect other platforms. a=chofmann
This commit is contained in:
Родитель
b6affc07ea
Коммит
e643619e08
|
@ -65,6 +65,7 @@ ENABLE_TESTS = @ENABLE_TESTS@
|
|||
ENABLE_PICS = @ENABLE_PICS@
|
||||
BUILD_IDLC = @BUILD_IDLC@
|
||||
USE_IMPLICIT_ARCHIVE = @USE_IMPLICIT_ARCHIVE@
|
||||
NEED_BASE_DLL_NAME_ALSO = @NEED_BASE_DLL_NAME_ALSO@
|
||||
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
|
||||
|
||||
|
|
|
@ -413,12 +413,20 @@ ifdef IS_COMPONENT
|
|||
ifeq ($(OS_ARCH),OpenVMS)
|
||||
$(INSTALL) -m 555 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/bin/components
|
||||
endif
|
||||
ifdef NEED_BASE_DLL_NAME_ALSO
|
||||
@cd $(DIST)/lib/components; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
|
||||
@cd $(DIST)/bin/components; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
|
||||
endif
|
||||
else
|
||||
$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/lib
|
||||
$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
|
||||
ifeq ($(OS_ARCH),OpenVMS)
|
||||
$(INSTALL) -m 555 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/bin
|
||||
endif
|
||||
ifdef NEED_BASE_DLL_NAME_ALSO
|
||||
@cd $(DIST)/lib; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
|
||||
@cd $(DIST)/bin; ln -s $(SHARED_LIBRARY) lib$(LIBRARY_NAME).so
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
+$(LOOP_OVER_DIRS)
|
||||
|
|
|
@ -329,6 +329,7 @@ OBJ_SUFFIX=o
|
|||
LIB_SUFFIX=a
|
||||
TARGET_MD_ARCH=unix
|
||||
DIRENT_INO=d_ino
|
||||
NEED_BASE_DLL_NAME_ALSO=
|
||||
|
||||
OS_TARGET=`uname -s`
|
||||
OS_ARCH=`uname -s | sed -e 's|/|_|g'`
|
||||
|
@ -610,6 +611,11 @@ case "$target" in
|
|||
MKSHLIB_FORCE_ALL='--whole-archive'
|
||||
MKSHLIB_UNFORCE_ALL='--no-whole-archive'
|
||||
case $OS_TEST in
|
||||
alpha)
|
||||
dnl NetBSD/alpha can't find a shared lib
|
||||
dnl (.so.1.0) unless there's a .so as well.
|
||||
NEED_BASE_DLL_NAME_ALSO=1
|
||||
;;
|
||||
*86)
|
||||
MKSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
MKCSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
|
@ -780,6 +786,9 @@ dnl the qsort routine under solaris is faulty
|
|||
|
||||
esac
|
||||
|
||||
dnl See above (netbsd)
|
||||
AC_SUBST(NEED_BASE_DLL_NAME_ALSO)
|
||||
|
||||
dnl Only one oddball right now (QNX), but this gives us flexibility
|
||||
dnl if any other platforms need to override this in the future.
|
||||
AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
|
||||
|
|
Загрузка…
Ссылка в новой задаче