diff --git a/openjdk11-boot/Pkgfile b/openjdk11-boot/Pkgfile
index ad78970..654071d 100644
--- a/openjdk11-boot/Pkgfile
+++ b/openjdk11-boot/Pkgfile
@@ -31,39 +31,42 @@ build() {
   unset CXXFLAGS
   unset LDFLAGS
   unset MAKEFLAGS
+  export _CFLAGS+=' -fcommon'
+  export _CXXFLAGS+=' -fcommon'
 
   [ -z $JOBS ] && JOBS=$(nproc)
 
   mkdir $SRC/{build-boot,build}
   cd $SRC/build-boot
 
-  export _CFLAGS+=' -fcommon'
-  export _CXXFLAGS+=' -fcommon'
+  local _COMMON_OPTIONS="
+    --disable-hotspot-gtest
+    --disable-precompiled-headers
+    --disable-warnings-as-errors
+    --enable-dtrace=no
+    --enable-headless-only
+    --enable-unlimited-crypto
+    --with-native-debug-symbols=none
+    --with-debug-level=release
+    --with-stdc++lib=dynamic
+    --with-jvm-variants=server
+    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver
+    --with-jtreg=no
+    --with-boot-jdk=$JAVA_HOME
+    --with-version-opt="CRUX-r$release"
+    --with-version-build=${version#*+}
+    --with-vendor-name=CRUX
+    --with-jobs=$JOBS
+    --with-libjpeg=system
+    --with-giflib=system
+    --with-libpng=system
+    --with-zlib=system
+    --with-lcms=system"
+
   LC_ALL=C
   /bin/bash ../jdk11u-$_jdkhash/configure $PKGMK_JDK11 \
     --prefix=$SRC/build-boot/images/jdk \
-    --disable-hotspot-gtest \
-    --disable-precompiled-headers \
-    --disable-warnings-as-errors \
-    --enable-dtrace=no \
-    --enable-headless-only \
-    --enable-unlimited-crypto \
-    --with-native-debug-symbols=none \
-    --with-debug-level=release \
-    --with-stdc++lib=dynamic \
-    --with-jvm-variants=server \
-    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
-    --with-jtreg=no \
-    --with-boot-jdk=$JAVA_HOME \
-    --with-version-opt="CRUX-r$release" \
-    --with-version-build="${version#*+}" \
-    --with-vendor-name="CRUX" \
-    --with-jobs=$JOBS \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-zlib=system \
-    --with-lcms=system \
+    $_COMMON_OPTIONS \
     --with-extra-cflags="$_CFLAGS" \
     --with-extra-cxxflags="$_CXXFLAGS"
 
@@ -79,28 +82,7 @@ build() {
   LC_ALL=C
   /bin/bash ../jdk11u-$_jdkhash/configure $PKGMK_JDK11 \
     --prefix=/$name \
-    --disable-hotspot-gtest \
-    --disable-precompiled-headers \
-    --disable-warnings-as-errors \
-    --enable-dtrace=no \
-    --enable-headless-only \
-    --enable-unlimited-crypto \
-    --with-native-debug-symbols=none \
-    --with-debug-level=release \
-    --with-stdc++lib=dynamic \
-    --with-jvm-variants=server \
-    --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
-    --with-jtreg=no \
-    --with-boot-jdk=$JAVA_HOME \
-    --with-version-opt="CRUX-r$release" \
-    --with-version-build="${version#*+}" \
-    --with-vendor-name="CRUX" \
-    --with-jobs=$JOBS \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-zlib=system \
-    --with-lcms=system \
+    $_COMMON_OPTIONS \
     --with-extra-cflags="$_CFLAGS" \
     --with-extra-cxxflags="$_CXXFLAGS"