diff options
| author | midipix <writeonce@midipix.org> | 2018-12-13 03:09:46 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-12-13 06:40:14 -0500 |
| commit | 04aa65dc7c08631136f69217e04b407dfd274c8e (patch) | |
| tree | 8ff713b34b0e4edf06e3983252ca9970a2f98aeb /project/config/cfgdefs.sh | |
| parent | 8e63a67cf02b6f320179726d4953d93a6e06bc7b (diff) | |
| download | sbpython2-04aa65dc7c08631136f69217e04b407dfd274c8e.tar.bz2 sbpython2-04aa65dc7c08631136f69217e04b407dfd274c8e.tar.xz | |
project: added and integrated cfghost.sh, refactored cfgdefs.sh accordingly.
Diffstat (limited to 'project/config/cfgdefs.sh')
| -rw-r--r-- | project/config/cfgdefs.sh | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh index c993def..81a9912 100644 --- a/project/config/cfgdefs.sh +++ b/project/config/cfgdefs.sh @@ -10,6 +10,9 @@ # finally, cfgdefs.sh may update the contents of the # build-time-generated cfgdefs.mk. +# cfgdefs helper functions +. "$mb_project_dir/project/config/cfghost.sh" + # no custom switches yet for arg ; do @@ -21,35 +24,14 @@ for arg ; do done -# cfghost: target -if [ -z "$mb_cfghost" ]; then - case "$mb_cchost" in - x86_64-*-linux | x86_64-*-linux-* | x86_64-linux-* ) - mb_cfghost=x86_64-linux ;; - - x86_64-*-midipix | x86_64-*-midipix-* | x86_64-midipix-* ) - mb_cfghost=x86_64-midipix ;; - esac -fi - - -# cfghost: (native) pycompile -mb_pycompile_cfghost=$($mb_native_cc -dumpmachine) - -case "$mb_pycompile_cfghost" in - x86_64-*-linux | x86_64-*-linux-* | x86_64-linux-* ) - mb_pycompile_cfghost=x86_64-linux ;; - - x86_64-*-midipix | x86_64-*-midipix-* | x86_64-midipix-* ) - mb_pycompile_cfghost=x86_64-midipix ;; -esac - - -# update cfgdefs.mk -sed -e 's^@pycompile_cfghost@^'"$mb_pycompile_cfghost"'^g' \ - $mb_project_dir/project/config/cfgdefs.in \ - > $mb_pwd/cfgdefs.mk || exit 2 +cfgdefs_set_cfghost_flavors() +{ + cfghost_set_target_cfghost + cfghost_set_native_cfghost +} +# cfghost +cfgdefs_set_cfghost_flavors # system tests: target mb_cfgdefs_cc=$(make -s -f Makefile.tmp .display-cc) |