diff --git a/client/Makefile.am b/client/Makefile.am
index 11ce206d4b..a85c8c1891 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,9 +1,7 @@
 ## -*- mode: makefile; tab-width: 4 -*-
 ## $Id$
 
-if OS_ARM_LINUX
-    CXXFLAGS := $(filter-out -mfpu=vfpv3-d16,$(CXXFLAGS))
-endif
+CXXFLAGS := $(filter-out -mfpu=vfpv3-d16,$(CXXFLAGS))
 
 include $(top_srcdir)/Makefile.incl
 
@@ -34,9 +32,6 @@ endif
 boinccmd_SOURCES = boinc_cmd.cpp
 boinccmd_DEPENDENCIES = $(LIBBOINC)
 boinccmd_CPPFLAGS = $(AM_CPPFLAGS)
-if OS_ARM_LINUX
-    boinccmd_CPPFLAGS += -mfpu=vfpv3-d16
-endif
 boinccmd_LDFLAGS = $(AM_LDFLAGS) -L$(top_srcdir)/lib
 boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
 
@@ -100,13 +95,7 @@ boinc_client_SOURCES = \
 
 boinc_client_DEPENDENCIES = $(LIBBOINC)
 boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
-if OS_ARM_LINUX
-    boinc_client_CPPFLAGS += -mfpu=vfpv3-d16
-endif
 boinc_client_CXXFLAGS = $(AM_CXXFLAGS) $(SSL_CXXFLAGS)
-if OS_ARM_LINUX
-    boinc_client_CPPFLAGS += -mfpu=vfpv3-d16
-endif
 boinc_client_LDFLAGS = $(AM_LDFLAGS) $(SSL_LDFLAGS) -L$(top_srcdir)/lib
 if OS_WIN32
 boinc_client_CXXFLAGS += -I$(top_srcdir)/coprocs/NVIDIA/include
@@ -127,6 +116,9 @@ boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD
 boinc_clientdir = $(bindir)
 
 if OS_ARM_LINUX
+boinccmd_CPPFLAGS += -mfpu=vfpv3-d16
+boinc_client_CPPFLAGS += -mfpu=vfpv3-d16
+boinc_client_CXXFLAGS += -mfpu=vfpv3-d16
 EXTRA_boinc_client_DEPENDENCIES = libwhetneon.a libwhetvfp.a
 boinc_client_LDADD += libwhetneon.a libwhetvfp.a
 noinst_LIBRARIES = libwhetneon.a libwhetvfp.a