diff options
| author | midipix <writeonce@midipix.org> | 2018-12-30 18:42:11 -0500 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2018-12-31 04:48:45 -0500 |
| commit | 34c6f25ea0c4cb006455050b5903425d974944da (patch) | |
| tree | 5540ff93f758bbe0f605d5973261033503dd4a4b | |
| parent | 7e34aa8d0cfd096571343a80eb537c84544d8c59 (diff) | |
| download | sbpython2-34c6f25ea0c4cb006455050b5903425d974944da.tar.bz2 sbpython2-34c6f25ea0c4cb006455050b5903425d974944da.tar.xz | |
project: made necessary adjustments following build system overhaul.
| -rw-r--r-- | project/config/cfgdefs.sh | 2 | ||||
| -rw-r--r-- | project/config/cfghost.sh | 6 | ||||
| -rw-r--r-- | project/osforce.mk | 2 | ||||
| -rw-r--r-- | project/pycompile.mk | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh index ecb0625..e616905 100644 --- a/project/config/cfgdefs.sh +++ b/project/config/cfgdefs.sh @@ -257,7 +257,7 @@ cfgdefs_perform_common_tests() if [ $mb_cfgtest_cfgtype = 'target' ]; then mb_cfgtest_makevar='CFLAGS_NCURSES' else - mb_cfgtest_makevar='NATIVE_CC_CFLAGS' + mb_cfgtest_makevar='NATIVE_CFLAGS' fi cfgtest_unit_header_presence 'curses.h' diff --git a/project/config/cfghost.sh b/project/config/cfghost.sh index c862e2b..563ccac 100644 --- a/project/config/cfghost.sh +++ b/project/config/cfghost.sh @@ -34,7 +34,7 @@ cfghost_internal_test() if [ $mb_internal_cfgtype = 'target' ]; then mb_cfghost="$mb_internal_cfghost" else - mb_native_cc_cfghost="$mb_internal_cfghost" + mb_native_cfghost="$mb_internal_cfghost" fi } @@ -49,8 +49,8 @@ cfghost_set_target_cfghost() cfghost_set_native_cfghost() { - mb_internal_cchost="$mb_native_cc_host" - mb_internal_cfghost="$mb_native_cc_cfghost" + mb_internal_cchost="$mb_native_cchost" + mb_internal_cfghost="$mb_native_cfghost" mb_internal_cfgtype='native' cfghost_internal_test diff --git a/project/osforce.mk b/project/osforce.mk index ea1eff2..09a8c58 100644 --- a/project/osforce.mk +++ b/project/osforce.mk @@ -1,4 +1,4 @@ -ifneq ($(CFGHOST),@cfghost@) +ifneq ($(CFGHOST),) include $(PROJECT_DIR)/config/$(CFGHOST)/config.mk endif diff --git a/project/pycompile.mk b/project/pycompile.mk index 7ec7664..32856bc 100644 --- a/project/pycompile.mk +++ b/project/pycompile.mk @@ -1,5 +1,5 @@ PYCOMPILE_DIR = build.pycompile -PYCOMPILE_CFGHOST = $(NATIVE_CC_CFGHOST) +PYCOMPILE_CFGHOST = $(NATIVE_CFGHOST) PYCOMPILE_PREFIX = $(CURDIR)/$(PYCOMPILE_DIR) PYCOMPILE_PATH = PYCOMPILE = $(PYCOMPILE_DIR)/bin/pycompile @@ -22,10 +22,10 @@ PYCOMPILE_CFLAGS += -DPREFIX=\"$(PYCOMPILE_PREFIX)\" PYCOMPILE_CFLAGS += -DEXEC_PREFIX=\"$(PYCOMPILE_PREFIX)\" PYCOMPILE_CFLAGS += -DPYTHONPATH=\"$(PYCOMPILE_PATH)\" PYCOMPILE_CFLAGS += -DABIFLAGS=\"$(PYTHON_ABIFL)\" -PYCOMPILE_CFLAGS += $(NATIVE_CC_CFLAGS) +PYCOMPILE_CFLAGS += $(NATIVE_CFLAGS) PYCOMPILE_LDFLAGS += -lreadline -lm -lutil -lpthread -PYCOMPILE_LDFLAGS += $(NATIVE_CC_LDFLAGS) +PYCOMPILE_LDFLAGS += $(NATIVE_LDFLAGS) PYCOMPILE_LDFLAGS += -lreadline -lm -lutil -lpthread $(PYCOMPILE_DIR)/tree.tag: |