diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2022-11-10 10:53:59 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2022-11-10 10:53:59 +0800 |
| commit | 50a07a4889c690b9dc1ce0fec6e72a6d8d340f6f (patch) | |
| tree | 5e73a01e8b67fa0410a4b9c78bcfd0bf54976482 | |
| parent | dacc10a8cfecd6e3e3b820e2fb046bb380e1f2a0 (diff) | |
| download | dropbear-50a07a4889c690b9dc1ce0fec6e72a6d8d340f6f.tar.gz | |
Just disable -Wundef for macos runners instead
The previous change to set TARGET_OS_EMBEDDED=0 didn't work
for libtommath which doesn't include Dropbear headers
| -rw-r--r-- | .github/workflows/build.yml | 7 | ||||
| -rw-r--r-- | sysoptions.h | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e71e82..ef29c68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,8 +53,9 @@ jobs: - name: macos 10.15 os: macos-10.15 cc: clang - # OS X says daemon() and utmp are deprecated - extracflags: -Wno-deprecated-declarations + # OS X says daemon() and utmp are deprecated. + # OS X tests for undefined TARGET_OS_EMBEDDED in libc headers + extracflags: -Wno-deprecated-declarations -Wno-undef runcheck: 'no' apt: 'no' # fails with: @@ -64,7 +65,7 @@ jobs: - name: macos 11 os: macos-11 cc: clang - extracflags: -Wno-deprecated-declarations + extracflags: -Wno-deprecated-declarations -Wno-undef runcheck: 'no' apt: 'no' ranlib: ranlib -no_warning_for_no_symbols diff --git a/sysoptions.h b/sysoptions.h index 3369a4a..89773e7 100644 --- a/sysoptions.h +++ b/sysoptions.h @@ -373,14 +373,4 @@ #define DROPBEAR_MULTI 0 #endif -/* MacOSX10.15.sdk headers don't work with -Wundef */ -#ifdef __APPLE__ - -#ifndef TARGET_OS_EMBEDDED -#define TARGET_OS_EMBEDDED 0 -#endif - -#endif /* __APPLE__ */ - - /* no include guard for this file */ |