Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63827 )
Change subject: meson: relocate add_project_arguments() for IS_WINDOWS ......................................................................
meson: relocate add_project_arguments() for IS_WINDOWS
Change-Id: I6afb65fabf858449f2706bf250588225a94c1871 Signed-off-by: Thomas Heijligen thomas.heijligen@secunet.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/63827 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Peter Marheine pmarheine@chromium.org Reviewed-by: Anastasia Klimchuk aklm@chromium.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M meson.build 1 file changed, 5 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved
diff --git a/meson.build b/meson.build index 6b088f0..56ff970 100644 --- a/meson.build +++ b/meson.build @@ -36,12 +36,6 @@ add_project_arguments('-D_BSD_SOURCE', language : 'c') # required for glibc < v2.19 add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', language : 'c')
-if host_machine.system() in ['cygwin', 'windows'] - add_project_arguments('-DIS_WINDOWS=1', language : 'c') -else - add_project_arguments('-DIS_WINDOWS=0', language : 'c') -endif - # get defaults from configure config_atahpt = get_option('config_atahpt') config_atapromise = get_option('config_atapromise') @@ -174,6 +168,11 @@ if cc.check_header('sys/utsname.h') add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') endif +if host_machine.system() in ['cygwin', 'windows'] + add_project_arguments('-DIS_WINDOWS=1', language : 'c') +else + add_project_arguments('-DIS_WINDOWS=0', language : 'c') +endif
srcs += 'platform/memaccess.c'
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.