diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in index bb172ab2f0a4..649d19dc604b 100644 --- a/build/unix/stdc++compat/Makefile.in +++ b/build/unix/stdc++compat/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = stdc++compat -DISABLED_HOST_LIBRARY_NAME = host_stdc++compat FORCE_STATIC_LIB= 1 STL_FLAGS = NO_EXPAND_LIBS = 1 diff --git a/config/rules.mk b/config/rules.mk index deb86b3e8dce..a8483511bbce 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -17,6 +17,7 @@ endif _MOZBUILD_EXTERNAL_VARIABLES := \ DIRS \ HOST_CSRCS \ + HOST_LIBRARY_NAME \ MODULE \ PARALLEL_DIRS \ TEST_DIRS \ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index deb86b3e8dce..a8483511bbce 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -17,6 +17,7 @@ endif _MOZBUILD_EXTERNAL_VARIABLES := \ DIRS \ HOST_CSRCS \ + HOST_LIBRARY_NAME \ MODULE \ PARALLEL_DIRS \ TEST_DIRS \ diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in index e14b16444417..fdb8b2a9fdf8 100644 --- a/modules/libbz2/src/Makefile.in +++ b/modules/libbz2/src/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = bz2 -DISABLED_HOST_LIBRARY_NAME = hostbz2 FORCE_STATIC_LIB= 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in index 59c01e80c2bb..e3db93a97925 100644 --- a/modules/libmar/src/Makefile.in +++ b/modules/libmar/src/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mar -DISABLED_HOST_LIBRARY_NAME = hostmar FORCE_STATIC_LIB = 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index e8f885ba5ea4..a1619416ddac 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -13,7 +13,6 @@ LIBRARY_NAME = breakpad_common_s MSVC_ENABLE_PGO := 1 ifneq (WINNT,$(OS_TARGET)) ifdef MOZ_CRASHREPORTER -DISABLED_HOST_LIBRARY_NAME = host_breakpad_common_s endif endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in index 136b9b74dd47..1c5b9d73dad7 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_CRASHREPORTER -DISABLED_HOST_LIBRARY_NAME = host_breakpad_dwarf_s LOCAL_INCLUDES = -I$(srcdir)/../.. diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in index 3e0609e0fb3c..3613d4415be3 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = breakpad_linux_common_s ifdef MOZ_CRASHREPORTER -DISABLED_HOST_LIBRARY_NAME = host_breakpad_linux_common_s endif LOCAL_INCLUDES = \ diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index 6f0b199f4911..f78d27d9735d 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = breakpad_mac_common_s -DISABLED_HOST_LIBRARY_NAME = host_breakpad_mac_common_s LOCAL_INCLUDES = -I$(srcdir)/../.. diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in index b514f737bb2a..3a4be333ea83 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = breakpad_solaris_common_s -DISABLED_HOST_LIBRARY_NAME = host_breakpad_solaris_common_s LOCAL_INCLUDES = -I$(srcdir)/../..