Skip to content

Commit

Permalink
Fix cross-build bug. Now ./tools/build.py --target-arch=i686 can gene…
Browse files Browse the repository at this point in the history
…rate 32bit binary correctly.

IoT.js-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com
  • Loading branch information
jiangzidong committed Oct 20, 2015
1 parent 90d604f commit f8e8391
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cmake/config/i686-linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ set(CMAKE_SYSTEM_PROCESSOR x86)

set(FLAGS_COMMON -D__LINUX__
-D__i686__
-march=i686
-m32
-fno-builtin)

foreach(FLAG ${FLAGS_COMMON})
Expand Down
2 changes: 2 additions & 0 deletions tools/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ def build_libuv():
check_run_cmd('./nuttx-configure', [opt_nuttx_home()])
elif opt_target_arch() == 'arm' and opt_target_os() =='linux':
check_run_cmd('./armlinux-configure')
elif opt_target_arch() == 'i686':
check_run_cmd('./gyp_uv.py', ['-f', 'make', '-Dtarget_arch=ia32'])
else:
check_run_cmd('./gyp_uv.py', ['-f', 'make'])

Expand Down

0 comments on commit f8e8391

Please sign in to comment.