diff --git a/recipes/hostpython/__init__.py b/recipes/hostpython/__init__.py
index 2645fce..3281a00 100644
--- a/recipes/hostpython/__init__.py
+++ b/recipes/hostpython/__init__.py
@@ -66,6 +66,7 @@ class HostpythonRecipe(Recipe):
                 ])
 
         if "openssl.build_all" in self.ctx.state:
+            build_env["LDFLAGS"] += " -L{}".format(join(self.ctx.dist_dir, "lib"))
             build_env["CFLAGS"] += " -I{}".format(join(self.ctx.dist_dir, "include",
                                                        "x86_64", "openssl"))
 
diff --git a/toolchain.py b/toolchain.py
index d91c792..c6b4275 100755
--- a/toolchain.py
+++ b/toolchain.py
@@ -178,6 +178,7 @@ class Arch(object):
                     sh.chmod('+x', cxxsh)
                 else:
                     ccsh = self._ccsh
+                    cxxsh = self._cxxsh
                 env["USE_CCACHE"] = '1'
                 env["CCACHE"] = ccache
                 env["CC"] = ccsh