8 files changed, 5 insertions, 4 deletions
diff --git a/recipes/erlang/erlang-R11B.1/Makefile.in.patch b/recipes/erlang/erlang/Makefile.in.patch
index 5b74ce77cd..5b74ce77cd 100644
--- a/recipes/erlang/erlang-R11B.1/Makefile.in.patch
+++ b/recipes/erlang/erlang/Makefile.in.patch
diff --git a/recipes/erlang/erlang-R11B.1/erts-configure.in.patch b/recipes/erlang/erlang/erts-configure.in.patch
index 6266c2fef7..6266c2fef7 100644
--- a/recipes/erlang/erlang-R11B.1/erts-configure.in.patch
+++ b/recipes/erlang/erlang/erts-configure.in.patch
diff --git a/recipes/erlang/erlang-R11B.1/erts-emulator-Makefile.in.patch b/recipes/erlang/erlang/erts-emulator-Makefile.in.patch
index 1c98ed81e9..1c98ed81e9 100644
--- a/recipes/erlang/erlang-R11B.1/erts-emulator-Makefile.in.patch
+++ b/recipes/erlang/erlang/erts-emulator-Makefile.in.patch
diff --git a/recipes/erlang/erlang-R11B.1/erts-etc-unix-Install.src.patch b/recipes/erlang/erlang/erts-etc-unix-Install.src.patch
index 9da1f7fe32..9da1f7fe32 100644
--- a/recipes/erlang/erlang-R11B.1/erts-etc-unix-Install.src.patch
+++ b/recipes/erlang/erlang/erts-etc-unix-Install.src.patch
diff --git a/recipes/erlang/erlang-R11B.1/lib-crypto-c_src-Makefile.in.patch b/recipes/erlang/erlang/lib-crypto-c_src-Makefile.in.patch
index a649c09bde..a649c09bde 100644
--- a/recipes/erlang/erlang-R11B.1/lib-crypto-c_src-Makefile.in.patch
+++ b/recipes/erlang/erlang/lib-crypto-c_src-Makefile.in.patch
diff --git a/recipes/erlang/erlang-R11B.1/lib-erl_interface-src-Makefile.in.patch b/recipes/erlang/erlang/lib-erl_interface-src-Makefile.in.patch
index 285012e0bd..285012e0bd 100644
--- a/recipes/erlang/erlang-R11B.1/lib-erl_interface-src-Makefile.in.patch
+++ b/recipes/erlang/erlang/lib-erl_interface-src-Makefile.in.patch
diff --git a/recipes/erlang/erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch b/recipes/erlang/erlang/lib-ssl-c_src-Makefile.in.patch
index cb91a79f2d..cb91a79f2d 100644
--- a/recipes/erlang/erlang-R11B.1/lib-ssl-c_src-Makefile.in.patch
+++ b/recipes/erlang/erlang/lib-ssl-c_src-Makefile.in.patch
diff --git a/recipes/erlang/erlang_R13B01.bb b/recipes/erlang/erlang_R13B01.bb
index e85a297ff9..33ecfc7564 100644
--- a/recipes/erlang/erlang_R13B01.bb
+++ b/recipes/erlang/erlang_R13B01.bb
@@ -1,14 +1,15 @@
 include erlang.inc
 DEPENDS += "erlang-native openssl"
 
-SRC_URI += "file://erts-configure.in.patch;patch=1 \
+SRC_URI += "\
             file://erts-emulator-Makefile.in.patch;patch=1 \
             file://erts-etc-unix-Install.src.patch;patch=1 \
-            file://lib-crypto-c_src-Makefile.in.patch;patch=1 \
             file://lib-erl_interface-src-Makefile.in.patch;patch=1 \
             file://Makefile.in.patch;patch=1 \
             "
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 EXTRA_OEMAKE = "BUILD_CC='${BUILD_CC}'"
 
 EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${layout_exec_prefix}"
@@ -50,7 +51,7 @@ do_install() {
     done
 }
 
-def get_erlang_libs(d):
+def get_erlang_libs_R13B01(d):
     import os, bb
     install_root = bb.data.getVar('D', d, 1)
     libdir = bb.data.getVar('libdir', d, 1)[1:]
@@ -68,5 +69,5 @@ def get_erlang_libs(d):
     return libs
 
 FILES_${PN}-dbg += " ${libdir}/erlang/bin/.debug ${libdir}/erlang/*/bin/.debug ${libdir}/erlang/lib/*/bin/.debug"
-FILES_${PN}-libs += " ${@' '.join(get_erlang_libs(d))}"
+FILES_${PN}-libs += " ${@' '.join(get_erlang_libs_R13B01(d))}"
 PACKAGES =+ "${PN}-libs"