summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-01-30 23:24:17 +0000
committerjstebbins <[email protected]>2015-01-30 23:24:17 +0000
commit652858987e87aedf12a6197976ffdf4b9ca40d88 (patch)
tree07f1d7024ec140700e1e536a0a6ac305793815e9 /make
parent9ade44ee4777791b6c19109e52c6a1a3878d126a (diff)
build: fix linux i686 build
Adds -msse2 to compiler flags which is needed by new nlmeans sse acceleration git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6837 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
-rw-r--r--make/configure.py3
-rw-r--r--make/include/gcc.defs8
2 files changed, 8 insertions, 3 deletions
diff --git a/make/configure.py b/make/configure.py
index 5f155fd70..89221f6cd 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1763,12 +1763,11 @@ int main()
select.doc_add( doc )
doc.addBlank()
+ doc.add( 'GCC.archs', arch.mode.mode )
if build.match( '*-*-darwin*' ):
- doc.add( 'GCC.archs', arch.mode.mode )
doc.add( 'GCC.sysroot', cfg.sysroot_dir )
doc.add( 'GCC.minver', cfg.minver )
else:
- doc.add( 'GCC.archs', '' )
doc.add( 'GCC.sysroot', '' )
doc.add( 'GCC.minver', '' )
diff --git a/make/include/gcc.defs b/make/include/gcc.defs
index b27c4a6ce..93d847575 100644
--- a/make/include/gcc.defs
+++ b/make/include/gcc.defs
@@ -46,7 +46,13 @@ GCC.args.dylib = -dynamiclib
GCC.args.ML = -fmessage-length=0
GCC.args.H = -H
GCC.args.W = -W$(1)
-GCC.args.archs = -arch $(1)
+ifeq (darwin,$(BUILD.system))
+ GCC.args.archs = -arch $(1)
+else ifeq (linux-i686,$(BUILD.system)-$(BUILD.arch))
+ GCC.args.archs = -msse2
+else
+ GCC.args.archs =
+endif
GCC.args.sysroot = --sysroot=$(1)
GCC.args.minver = -mmacosx-version-min=$(1)
GCC.args.vis = -fvisibility=hidden