Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 935881 - Make libxul's LIBRARY_NAME 'xul' on mac. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2013-11-19 11:46:40 +09:00
parent 3d6069c9d5
commit a1e2022b0c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/library/Makefile.in
View File

@ -6,6 +6,9 @@ FORCE_SHARED_LIB = 1
MOZILLA_INTERNAL_API = 1
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
# This is going to be a framework named "XUL", not an ordinary library named
# "libxul.dylib"
SHARED_LIBRARY_NAME=XUL
# Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
# setting SHARED_LIBRARY; we need to leave DLL_PREFIX and DLL_SUFFIX
# as-is so that dependencies of the form -ltracemalloc still work.
@ -646,7 +649,7 @@ EFFECTIVE_LIB_PREFIX=$(DLL_PREFIX)
EFFECTIVE_LIB_SUFFIX=$(DLL_SUFFIX)
endif
GTEST_LIB = $(EFFECTIVE_LIB_PREFIX)gtest/$(EFFECTIVE_LIB_PREFIX)$(LIBRARY_NAME)$(EFFECTIVE_LIB_SUFFIX)
GTEST_LIB = $(EFFECTIVE_LIB_PREFIX)gtest/$(EFFECTIVE_LIB_PREFIX)$(SHARED_LIBRARY_NAME)$(EFFECTIVE_LIB_SUFFIX)
EXTRA_MDDEPEND_FILES = $(GTEST_LIB).pp
include $(topsrcdir)/config/rules.mk

7
toolkit/library/moz.build
View File

@ -9,12 +9,7 @@ if CONFIG['MOZ_METRO'] and CONFIG['OS_ARCH'] == 'WINNT':
MODULE = 'libxul'
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
# This is going to be a framework named "XUL", not an ordinary library named
# "libxul.dylib"
LIBRARY_NAME = 'XUL'
else:
LIBRARY_NAME = 'xul'
LIBRARY_NAME = 'xul'
SOURCES += [
'nsStaticXULComponents.cpp',