Merge pull request #31 from ZOSOpenTools/common_cflags

Use a common cflags for m4
zopencommunity · Apr 24, 2023 · 48525a8 · 48525a8
2 parents 3db39a8 + 10a8657
commit 48525a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/buildenv b/buildenv
@@ -1,7 +1,7 @@
 #
 # Set up environment variables for general build tool to operate
 #
-export ZOPEN_TYPE="GIT"
+export ZOPEN_TYPE="TARBALL"
 
 ZOPEN_TARBALL_DIR=m4-1.4.19
 export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/m4/${ZOPEN_TARBALL_DIR}.tar.gz"
@@ -17,13 +17,13 @@ export ZOPEN_EXTRA_LDFLAGS=""
 rm patches
 if [ "${ZOPEN_TYPE}x" = "TARBALLx" ]; then
 	export ZOPEN_BOOTSTRAP=skip
-	export ZOPEN_EXTRA_CFLAGS="-qnose -std=c11 -I\${ZOPEN_ROOT}/${ZOPEN_TARBALL_DIR}/lib,\${ZOPEN_ROOT}/patches/PR1/include,/usr/include/le"
 	ln -s tarball-patches patches
 else
-	export ZOPEN_EXTRA_CFLAGS="-std=c11 -fgnu89-inline -I\${ZOPEN_ROOT}/${ZOPEN_GIT_DIR}/lib -I\${ZOPEN_ROOT}/patches/PR1/include"
 	ln -s git-patches patches
 fi
 
+export ZOPEN_EXTRA_CFLAGS="-std=c11 -fgnu89-inline -I\${ZOPEN_ROOT}/${ZOPEN_GIT_DIR}/lib -I\${ZOPEN_ROOT}/patches/PR1/include"
+
 zopen_append_to_env()
 {
 cat <<ZZ