From 1877e49bc46cf75ef06d83d39493bcd87639a330 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 2 Nov 2017 11:47:48 -0700
Subject: [PATCH] Bug 1411712 - Move symbol version script flags for arm in
 mozglue to moz.build. r=mshal

MozReview-Commit-ID: II250cfTmip

--HG--
extra : rebase_source : 70a8764e3bb646c54005fb25dc4343fdc201bade
---
 mozglue/build/Makefile.in | 7 -------
 mozglue/build/moz.build   | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in
index 1cfa41ea040d..0a86b3c15d73 100644
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -14,10 +14,3 @@ GARBAGE += mozglue.def
 endif
 
 include $(topsrcdir)/mozglue/build/replace_malloc.mk
-
-ifdef MOZ_LINKER
-ifeq (arm, $(TARGET_CPU))
-OS_LDFLAGS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
-endif
-
-endif
diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
index c3594f0afac3..9970259601b9 100644
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -98,4 +98,7 @@ if CONFIG['OS_TARGET'] == 'Darwin':
     # for TLS.
     LDFLAGS += ['-Wl,-bind_at_load']
 
+if CONFIG['MOZ_LINKER'] and CONFIG['TARGET_CPU'] == 'arm':
+    LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR]
+
 DIST_INSTALL = True