wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1045783 - Move HOST_EXTRA_LIBS to moz.build as HOST_OS_LIBS. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2014-08-06 07:26:05 +09:00
parent 1cb5547cd1
commit 3e3afccd68
7 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.mk
View File

@ -49,6 +49,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
FINAL_LIBRARY \
HOST_CSRCS \
HOST_CMMSRCS \
HOST_EXTRA_LIBS \
HOST_LIBRARY_NAME \
HOST_PROGRAM \
HOST_SIMPLE_PROGRAMS \

4
modules/libmar/tool/Makefile.in
View File

@ -28,10 +28,6 @@ EXTRA_LIBS += \
$(NULL)
endif
ifeq ($(HOST_OS_ARCH),WINNT)
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,ws2_32)
endif
include $(topsrcdir)/config/rules.mk
ifdef CROSS_COMPILE

5
modules/libmar/tool/moz.build
View File

@ -46,3 +46,8 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
OS_LIBS += [
'-framework Security',
]
if CONFIG['HOST_OS_ARCH'] == 'WINNT':
HOST_OS_LIBS += [
'ws2_32',
]

2
mozglue/linker/Makefile.in
View File

@ -2,8 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
HOST_EXTRA_LIBS += -lz
include $(topsrcdir)/config/rules.mk
ifeq (arm,$(TARGET_CPU))

4
mozglue/linker/moz.build
View File

@ -28,3 +28,7 @@ DEFINES['IMPL_MFBT'] = True
DISABLE_STL_WRAPPING = True
TEST_DIRS += ['tests']
HOST_OS_LIBS += [
'z',
]

8
other-licenses/bsdiff/Makefile.in
View File

@ -25,14 +25,6 @@
# This program is output to dist/host/bin because it is only needed by the
# build system and is not intended to be included in Mozilla distributions.
ifdef MOZ_NATIVE_BZ2
HOST_EXTRA_LIBS += $(MOZ_BZ2_LIBS)
endif
ifeq ($(HOST_OS_ARCH),WINNT)
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
endif
include $(topsrcdir)/config/rules.mk
HOST_CXXFLAGS += $(MOZ_BZ2_CFLAGS)

9
other-licenses/bsdiff/moz.build
View File

@ -10,11 +10,18 @@ HOST_SOURCES += [
HOST_PROGRAM = 'mbsdiff'
if not CONFIG['MOZ_NATIVE_BZ2']:
if CONFIG['MOZ_NATIVE_BZ2']:
HOST_OS_LIBS += CONFIG['MOZ_BZ2_LIBS']
else:
HOST_USE_LIBS += [
'hostbz2',
]
if CONFIG['HOST_OS_ARCH'] == 'WINNT':
HOST_OS_LIBS += [
'ws2_32',
]
LOCAL_INCLUDES += [
'/toolkit/mozapps/update/updater',
]