diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index e335085..d602a06 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -231,6 +231,8 @@ sed -i -e 's|linux/x86_64/|linux/%{eclipse_arch}/|' \
 sed -i -e 's|linux/x86/|linux/%{eclipse_arch}/|' \
   native/org.eclipse.cdt.native.serial/jni/Makefile
 %endif
+sed -i -e 's|-m.. -fPIC -D_REENTRANT|$(CFLAGS)|' \
+  native/org.eclipse.cdt.native.serial/jni/Makefile
 
 # Force the arch-specific plug-ins to be dir-shaped so that binary stripping works and the native files
 # aren't loaded into the user.home .eclipse configuration
@@ -355,7 +357,7 @@ export JAVA_HOME=%{_jvmdir}/java
 
 # Build native serial library
 pushd native/org.eclipse.cdt.native.serial/jni
-make ../os/linux/%{eclipse_arch}/libserial.so
+make CFLAGS="%{optflags}" ../os/linux/%{eclipse_arch}/libserial.so
 popd
 
 # Exclude EquinoxResolver to avoid NPE occuring on arm