summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2008-06-27 19:27:49 +0000
committerEric Sandall2008-07-01 03:13:07 -0700
commit5e77b6090bafcf841299521de7df2f802603f330 (patch)
tree6955eed56cb4a90d802ef0edcf66abb36ab893ae
parent798510c83a797e8c85610c02f45689db31c99aec (diff)
libx86: Fix compilation on x86_64 (use x86emu backend)
-rwxr-xr-xlibs/libx86/BUILD8
-rw-r--r--libs/libx86/HISTORY1
2 files changed, 8 insertions, 1 deletions
diff --git a/libs/libx86/BUILD b/libs/libx86/BUILD
index 4f252d4196..d76dd49334 100755
--- a/libs/libx86/BUILD
+++ b/libs/libx86/BUILD
@@ -1 +1,7 @@
-make "LIBDIR=$INSTALL_ROOT/usr/lib CFLAGS=$CFLAGS"
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ OPTS="BACKEND=x86emu"
+else
+ OPTS=""
+fi &&
+
+make "LIBDIR=$INSTALL_ROOT/usr/lib CFLAGS=$CFLAGS" $OPTS
diff --git a/libs/libx86/HISTORY b/libs/libx86/HISTORY
index 43d4f66b56..5a97dc8450 100644
--- a/libs/libx86/HISTORY
+++ b/libs/libx86/HISTORY
@@ -1,6 +1,7 @@
2008-06-27 Eric Sandall <sandalle@sourcemage.org>
* BUILD: Install using INSTALL_ROOT for LIBDIR
Use user defined CFLAGS
+ Fix compilation with x86_64 (build using x86emu backend)
2008-06-04 Mathieu Lonjaret <lejatorn@sourcemage.org>
* BUILD, DETAILS, HISTORY: spell created