diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-21 15:15:55 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-21 15:16:01 +1000 |
| commit | 667f672c94eb3e935ae3463a203dfa85b900726a (patch) | |
| tree | 12af1bd5078a2f3a6c80514483ae7646dec60ec4 /buildtools/wafsamba/wscript | |
| parent | 5e695dec2af347dd9211a1dec45f10f751bbafb5 (diff) | |
| download | samba-667f672c94eb3e935ae3463a203dfa85b900726a.tar.gz samba-667f672c94eb3e935ae3463a203dfa85b900726a.tar.bz2 samba-667f672c94eb3e935ae3463a203dfa85b900726a.zip | |
build: fixed uname output to be on target machine when cross compiling
this also makes the output of define_ret configure tests show up
in the configure output
Diffstat (limited to 'buildtools/wafsamba/wscript')
| -rw-r--r-- | buildtools/wafsamba/wscript | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 66e1ae518e..72e0e90fbf 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -130,9 +130,6 @@ def configure(conf): conf.check_tool('gnu_dirs') conf.check_tool('wafsamba') - conf.CHECK_UNAME(msg='Checking system type', define='SYSTEM_UNAME') - conf.CHECK_UNAME(flags='-a') - conf.CHECK_CC_ENV() conf.check_tool('compiler_cc') @@ -177,8 +174,14 @@ def configure(conf): if Options.options.ABI_CHECK_DISABLE: conf.env.ABI_CHECK = False + conf.CHECK_COMMAND(['uname', '-a'], + msg='Checking build system', + define='BUILD_SYSTEM', + on_target=False) + conf.CHECK_UNAME() + # see if we can compile and run a simple C program - conf.CHECK_CODE('printf("hello world\\n")', + conf.CHECK_CODE('printf("hello world")', define='HAVE_SIMPLE_C_PROG', mandatory=True, execute=True, |