summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-30 18:44:20 -0500
committermidipix <writeonce@midipix.org>2018-12-31 04:24:38 -0500
commitcc78d96910db0c881619661322176648407b50ba (patch)
tree1b078e02de308ad8746288c7381b8fd27f5d34cc
parentc0ca973d8356cacc3ecde24d242297ea23e11c28 (diff)
downloadsbpython3-cc78d96910db0c881619661322176648407b50ba.tar.bz2
sbpython3-cc78d96910db0c881619661322176648407b50ba.tar.xz
project: made necessary adjustments following build system overhaul.
-rw-r--r--project/config/cfgdefs.sh2
-rw-r--r--project/config/cfghost.sh6
-rw-r--r--project/osforce.mk2
-rw-r--r--project/pycompile.mk8
4 files changed, 9 insertions, 9 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 0ee01b8..314c6d4 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
@@ -26,10 +26,10 @@ PYCOMPILE_CFLAGS += -DPYTHONPATH=\"$(PYCOMPILE_PATH)\"
PYCOMPILE_CFLAGS += -DSOABI=\"$(PYTHON_SOABI)\"
PYCOMPILE_CFLAGS += -DABIFLAGS=\"$(PYTHON_ABIFL)\"
PYCOMPILE_CFLAGS += -D_PYTHONFRAMEWORK=\"\"
-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:
@@ -88,7 +88,7 @@ $(PYCOMPILE_DIR)/core/%.o: $(SOURCE_DIR)/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
$(PYCOMPILE_DIR)/pyext/obj/%.o: $(SOURCE_DIR)/Modules/%.c $(ALL_HEADERS) $(PYCOMPILE_TAGS)
$(NATIVE_CC) -c -o $@ $< $(PYCOMPILE_CFLAGS)
-$(PYCOMPILE_DIR)/pyext/obj/_decimal/%.o: NATIVE_CC_CFLAGS += -DUNIVERSAL
+$(PYCOMPILE_DIR)/pyext/obj/_decimal/%.o: NATIVE_CFLAGS += -DUNIVERSAL
PYCOMPILE_PYEXT_SRCS = \