Bug 1168293 - Remove MOZ_GLUE_IN_PROGRAM from config/config.mk. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 26 May 2015 16:11:37 +0900
changeset 245803 24a36d02b9a79ba80b45441a8e5d51cf0f0766c7
parent 245802 d175ca805ee5375db64841fec59608a2bfdb2cf8
child 245804 55b6a6d3e2be5ba3d0997e29f3c03974fd69e49d
push id13198
push userkwierso@gmail.com
push dateThu, 28 May 2015 00:24:10 +0000
treeherderfx-team@242916838c5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1168293
milestone41.0a1
Bug 1168293 - Remove MOZ_GLUE_IN_PROGRAM from config/config.mk. r=mshal
config/config.mk
configure.in
js/src/configure.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -232,20 +232,16 @@ else
 OS_LDFLAGS = -DEBUG -OPT:REF
 endif
 endif # MOZ_DMD
 
 endif # MOZ_DEBUG
 
 endif # WINNT && !GNU_CC
 
-ifdef MOZ_GLUE_IN_PROGRAM
-DEFINES += -DMOZ_GLUE_IN_PROGRAM
-endif
-
 #
 # Build using PIC by default
 #
 _ENABLE_PIC=1
 
 # No sense in profiling tools
 ifdef INTERNAL_TOOLS
 NO_PROFILE_GUIDED_OPTIMIZE = 1
--- a/configure.in
+++ b/configure.in
@@ -7084,16 +7084,17 @@ MOZ_ARG_ENABLE_BOOL(jemalloc,
 
 case "${OS_TARGET}" in
 Android|WINNT|Darwin)
   MOZ_GLUE_IN_PROGRAM=
   ;;
 *)
   dnl On !Android !Windows !OSX, we only want to link executables against mozglue
   MOZ_GLUE_IN_PROGRAM=1
+  AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
   ;;
 esac
 
 dnl ========================================================
 dnl = Enable dynamic replacement of malloc implementation
 dnl ========================================================
 if test -n "$NIGHTLY_BUILD" -a -n "$MOZ_MEMORY"; then
   # Enable on central for the debugging opportunities it adds.
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2980,16 +2980,17 @@ fi
 
 case "${OS_TARGET}" in
 Android|WINNT|Darwin)
   MOZ_GLUE_IN_PROGRAM=
   ;;
 *)
   dnl On !Android !Windows !OSX, we only want to link executables against mozglue
   MOZ_GLUE_IN_PROGRAM=1
+  AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
   ;;
 esac
 
 if test "$MOZ_MEMORY"; then
   AC_DEFINE(MOZ_MEMORY)
   if test "x$MOZ_DEBUG" = "x1"; then
     AC_DEFINE(MOZ_MEMORY_DEBUG)
   fi