Merge pull request #13 from dozylynx/x64

OXT-1477 : Enable building OCaml binaries for x86_64
OpenXT · Mar 25, 2019 · 43165ad · 43165ad
2 parents 4a3a59b + 79d907c
commit 43165ad
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/recipes-devtools/ocaml/ocaml-cross_4.04.2.bb b/recipes-devtools/ocaml/ocaml-cross_4.04.2.bb
@@ -21,10 +21,9 @@ PN = "ocaml-cross-${TARGET_ARCH}"
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 COMPATIBLE_MACHINE = "(-)"
 COMPATIBLE_MACHINE_x86 = "(.*)"
-#COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE_x86-64 = "(.*)"
 
 # Speed things up since we assume host is of the same architecture.
-# Current OpenXT target are linux 32 bit.
 do_configure_x86() {
     ./configure -no-curses \
                 -no-graph \
@@ -40,6 +39,21 @@ do_configure_x86() {
                 ${EXTRA_CONF}
 }
 
+do_configure_x86-64() {
+    ./configure -no-curses \
+                -no-graph \
+                -prefix ${prefix} \
+                -bindir ${bindir} \
+                -libdir ${libdir}/ocaml \
+                -mandir ${datadir}/man \
+                -cc "${TARGET_PREFIX}gcc -fPIC --sysroot=${STAGING_DIR_TARGET}" \
+                -as "${TARGET_PREFIX}as" \
+                -aspp "${TARGET_PREFIX}gcc -c -fPIC" \
+                -host ${TARGET_SYS} \
+                -partialld "${TARGET_PREFIX}ld -r" \
+                ${EXTRA_CONF}
+}
+
 # Ignore how TARGET_ARCH is computed.
 TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}"