fix hostpython openssl inclusion, and cxxsh
This commit is contained in:
parent
6ffd07ab06
commit
3f262e6549
2 changed files with 2 additions and 0 deletions
|
@ -66,6 +66,7 @@ class HostpythonRecipe(Recipe):
|
||||||
])
|
])
|
||||||
|
|
||||||
if "openssl.build_all" in self.ctx.state:
|
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",
|
build_env["CFLAGS"] += " -I{}".format(join(self.ctx.dist_dir, "include",
|
||||||
"x86_64", "openssl"))
|
"x86_64", "openssl"))
|
||||||
|
|
||||||
|
|
|
@ -178,6 +178,7 @@ class Arch(object):
|
||||||
sh.chmod('+x', cxxsh)
|
sh.chmod('+x', cxxsh)
|
||||||
else:
|
else:
|
||||||
ccsh = self._ccsh
|
ccsh = self._ccsh
|
||||||
|
cxxsh = self._cxxsh
|
||||||
env["USE_CCACHE"] = '1'
|
env["USE_CCACHE"] = '1'
|
||||||
env["CCACHE"] = ccache
|
env["CCACHE"] = ccache
|
||||||
env["CC"] = ccsh
|
env["CC"] = ccsh
|
||||||
|
|
Loading…
Reference in a new issue