diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-04-29 10:49:30 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-05-06 16:03:10 +0200 |
| commit | 73323ec644212921fe72938b3ee883bc6b28967a (patch) | |
| tree | 4d3ab2796ee787e63cc44622e7646a6ade99b00b /recipes/toolchain | |
| parent | 5fd390031a41bc79cf142468eb27c493268e8b87 (diff) | |
toolchain: fix x86 build from x86_64 build machine
Diffstat (limited to 'recipes/toolchain')
| -rw-r--r-- | recipes/toolchain/gcc-core.recipe | 1 | ||||
| -rw-r--r-- | recipes/toolchain/mingw-w64-headers.recipe | 9 | ||||
| -rw-r--r-- | recipes/toolchain/winpthreads.recipe | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/recipes/toolchain/gcc-core.recipe b/recipes/toolchain/gcc-core.recipe index 09404f1b..fd4b3172 100644 --- a/recipes/toolchain/gcc-core.recipe +++ b/recipes/toolchain/gcc-core.recipe @@ -15,6 +15,7 @@ class Recipe(recipe.Recipe): make_install = 'make install-gcc' use_system_libs = True supports_non_src_build = True + add_host_build_target = False deps = ['mingw-w64-headers', 'gmp', 'mpfr', 'mpc'] new_env = {'CPP': None} diff --git a/recipes/toolchain/mingw-w64-headers.recipe b/recipes/toolchain/mingw-w64-headers.recipe index 9e4b6d84..965a0376 100644 --- a/recipes/toolchain/mingw-w64-headers.recipe +++ b/recipes/toolchain/mingw-w64-headers.recipe @@ -3,7 +3,7 @@ class Recipe(recipe.Recipe): version = 'v2.0.8' licenses = [License.LGPL] srcdir = 'mingw-w64-headers' - add_host_build_target = True + add_host_build_target = False def prepare(self): self.remotes = {'origin': '%s/%s' % @@ -26,15 +26,10 @@ class Recipe(recipe.Recipe): hostdir = os.path.join(self.host) mingwdir = os.path.join('mingw') - if not os.path.exists(mingwdir): + if not os.path.exists(os.path.join(self.config.prefix, mingwdir)): shell.call('ln -s %s %s' % (hostdir, mingwdir), cmd_dir=self.config.prefix, fail=False, ) - # Create link lib32 -> lib - libdir = os.path.join(hostdir, lib) - archlibdir = os.path.join(hostdir, lib) - shell.call('ln -s %s %s' % (libdir, archlibdir), fail=False) - # Install DirectX headers directx_headers = os.path.join(self.config.prefix, self.host, 'include', 'directx') if not os.path.exists(directx_headers): diff --git a/recipes/toolchain/winpthreads.recipe b/recipes/toolchain/winpthreads.recipe index b53b145c..5b26c179 100644 --- a/recipes/toolchain/winpthreads.recipe +++ b/recipes/toolchain/winpthreads.recipe @@ -4,6 +4,8 @@ class Recipe(recipe.Recipe): licenses = [License.LGPL] srcdir = 'mingw-w64-libraries/winpthreads' configure_options = '--enable-shared --enable-static ' + add_host_build_target = False + autoreconf = True files_all = [ 'bin/libwinpthread-1.dll', 'lib/libpthread.a', |