summaryrefslogtreecommitdiff
path: root/numpy/core/SConscript
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-11-27 18:59:55 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-11-27 18:59:55 +0000
commit17e51af8e7e1b13f3ec19a8a25c40c85667265e9 (patch)
treeadb5e1ec0a8b196e6909a29bcfdf53a3925c2166 /numpy/core/SConscript
parent9ff1e779b54237cfbcb6612feb387ad6736f8856 (diff)
downloadnumpy-17e51af8e7e1b13f3ec19a8a25c40c85667265e9.tar.gz
BUG: (#1221) special case mac os x in numpyconfig.h
Universal builds break the configure stage: we have to harcode the arch-specific values in the case of mac os x, as we have only one configuration stage per compile, but several arch per compile with the braindead -arch machinery. We rename the old numpyconfig.h to a private header, and numpyconfig.h itself post-fix the values in the case of mac os x.
Diffstat (limited to 'numpy/core/SConscript')
-rw-r--r--numpy/core/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript
index d94282d8c..8d6e03b8e 100644
--- a/numpy/core/SConscript
+++ b/numpy/core/SConscript
@@ -337,8 +337,8 @@ for key, value in numpyconfig_sym:
env['SUBST_DICT'] = config_dict
include_dir = 'include/numpy'
-target = env.SubstInFile(pjoin(include_dir, 'numpyconfig.h'),
- pjoin(include_dir, 'numpyconfig.h.in'))
+target = env.SubstInFile(pjoin(include_dir, '_numpyconfig.h'),
+ pjoin(include_dir, '_numpyconfig.h.in'))
generated_headers.append(target[0])
env['CONFIG_H_GEN'] = numpyconfig_sym