diff options
| author | midipix <writeonce@midipix.org> | 2021-04-09 10:19:07 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-04-10 20:55:01 +0000 |
| commit | e0f9084e180c99f6b51524a42cbdae7c680ee009 (patch) | |
| tree | c51db9e3484e2500cfcbb46f2c79b747d6a53244 | |
| parent | aebb775b4178ddd2c11ff9557512f996ec0fe207 (diff) | |
| download | w32lib-e0f9084e180c99f6b51524a42cbdae7c680ee009.tar.bz2 w32lib-e0f9084e180c99f6b51524a42cbdae7c680ee009.tar.xz | |
build system: posix make support: remove ifeq statement for OS_DSO_EXRULES.
| -rw-r--r-- | sofort/ccenv/ccenv.sh | 4 | ||||
| -rw-r--r-- | sofort/core/flavor.mk | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index 5db4a04..0f94ddc 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -1369,7 +1369,7 @@ ccenv_common_init() if [ $ccenv_cfgtype = 'host' ]; then ccenv_tflags= - ccenv_cflags=$(${mb_make} -s -f "$mb_pwd/Makefile.tmp" .cflags-host) + ccenv_cflags=$(${mb_make} -s -f "$mb_pwd/Makefile.tmp" OS_DSO_EXRULES=default .cflags-host) ccenv_cc="$mb_user_cc" ccenv_cpp="$mb_user_cpp" @@ -1379,7 +1379,7 @@ ccenv_common_init() ccenv_pe_image_base="$mb_pe_image_base" else ccenv_tflags= - ccenv_cflags=$(${mb_make} -s -f "$mb_pwd/Makefile.tmp" .cflags-native) + ccenv_cflags=$(${mb_make} -s -f "$mb_pwd/Makefile.tmp" OS_DSO_EXRULES=default .cflags-native) ccenv_cc="$mb_native_cc" ccenv_cpp="$mb_native_cpp" ccenv_cxx="$mb_native_cxx" diff --git a/sofort/core/flavor.mk b/sofort/core/flavor.mk index 85c41a2..45b16d7 100644 --- a/sofort/core/flavor.mk +++ b/sofort/core/flavor.mk @@ -1,9 +1,7 @@ # flavor.mk: top-level handling of build flavors. # this file is covered by COPYING.SOFORT. -ifneq ($(OS_DSO_EXRULES),) include $(PROJECT_DIR)/sofort/exrules/$(OS_DSO_EXRULES).mk -endif ifeq ($(DISABLE_STATIC),yes) package-static: |