diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-03-01 12:18:11 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-03-01 12:18:11 +0000 |
| commit | eecc23b563b9759556f3ccf9a8595e7bb6a2215c (patch) | |
| tree | 405143d872a3e7ff71e7e557615db6d1b10cb0bd | |
| parent | e2e8e16b465d34759678b8170c44ce62c5b74eb0 (diff) | |
| download | busybox-w32-eecc23b563b9759556f3ccf9a8595e7bb6a2215c.tar.gz busybox-w32-eecc23b563b9759556f3ccf9a8595e7bb6a2215c.tar.bz2 busybox-w32-eecc23b563b9759556f3ccf9a8595e7bb6a2215c.zip | |
Post-merge build fixes
| -rw-r--r-- | Makefile.flags | 2 | ||||
| -rw-r--r-- | include/platform.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.flags b/Makefile.flags index 8ea0687c7..dfdd957f3 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
| @@ -147,7 +147,7 @@ export SYSROOT=$(CONFIG_SYSROOT) | |||
| 147 | endif | 147 | endif |
| 148 | 148 | ||
| 149 | ifeq ($(CONFIG_PLATFORM_MINGW32),y) | 149 | ifeq ($(CONFIG_PLATFORM_MINGW32),y) |
| 150 | CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy -fno-ident -fno-builtin-strndup | 150 | CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy -fno-builtin-stpncpy -fno-ident -fno-builtin-strndup |
| 151 | EXEEXT = .exe | 151 | EXEEXT = .exe |
| 152 | LDLIBS += ws2_32 mingwex -l:libssp.a | 152 | LDLIBS += ws2_32 mingwex -l:libssp.a |
| 153 | endif | 153 | endif |
diff --git a/include/platform.h b/include/platform.h index dc4a63ed4..d992b2633 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -465,6 +465,7 @@ typedef unsigned smalluint; | |||
| 465 | # undef HAVE_MKDTEMP | 465 | # undef HAVE_MKDTEMP |
| 466 | # undef HAVE_SETBIT | 466 | # undef HAVE_SETBIT |
| 467 | # undef HAVE_STPCPY | 467 | # undef HAVE_STPCPY |
| 468 | # undef HAVE_STPNCPY | ||
| 468 | # undef HAVE_STRCASESTR | 469 | # undef HAVE_STRCASESTR |
| 469 | # undef HAVE_STRCHRNUL | 470 | # undef HAVE_STRCHRNUL |
| 470 | # undef HAVE_STRSEP | 471 | # undef HAVE_STRSEP |