Changeset 6122 for pjproject/trunk/configure-android

Timestamp:

Dec 19, 2019 11:31:55 AM (4 years ago)

Author:

nanang

Message:

Re #2256: Readjusted build configs (after r6120 & r6121) to accomodate the convention that CXXFLAGS always includes CFLAGS in all PJSIP modules.

File:

• pjproject/trunk/configure-android (modified) (3 diffs)

pjproject/trunk/configure-android

@@ -107 +107 @@
         continue
       fi
-      if test "x`echo $i|grep ${IGNORE_CPPFLAGS}`" = "x"; then
-        NDK_CXXFLAGS="${NDK_CXXFLAGS} $i"
-      fi
+      if test "x`echo $i|grep ${IGNORE_CPPFLAGS}`" != "x"; then
+        continue
+      fi
+      # Check if flag is already in CFLAGS
+      ISDUP="0"
+      for j in $NDK_CFLAGS; do
+        if test "$i" = "$j"; then
+          ISDUP="1"
+          break
+        fi
+      done
+      if test "${ISDUP}" = "1"; then
+        continue
+      fi
+      NDK_CXXFLAGS="${NDK_CXXFLAGS} $i"
       continue
     fi
@@ -254 +266 @@
   export CXX="${NDK_CXX}"
 
-  export LDFLAGS="${NDK_LDFLAGS}"
+  export CPPFLAGS="${CPPFLAGS}"
+  export CFLAGS="${NDK_CFLAGS} ${CFLAGS} ${CPPFLAGS}"
+  export CXXFLAGS="${NDK_CXXFLAGS} ${CPPFLAGS}"
+  export LDFLAGS="${NDK_LDFLAGS} ${LDFLAGS}"
   export LIBS="${LIBS}"
-  export CFLAGS="${NDK_CFLAGS} ${CFLAGS}"
-  export CPPFLAGS="${NDK_CXXFLAGS} ${CPPFLAGS}"
-  export CXXFLAGS="${CPPFLAGS}"
 
 else
@@ -324 +336 @@
 #STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/${TARGET_ABI}"
 
-export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}"
-export LIBS="${STDCPP_LIBS} ${LIBS}"
+export CFLAGS="${CFLAGS}"
+export LIBS="${LIBS} ${STDCPP_LIBS}"
 export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}"
-export CPPFLAGS="${CPPFLAGS} ${STDCPP_CFLAGS}"
-export CXXFLAGS="${CPPFLAGS}"
+export CPPFLAGS="${CPPFLAGS}"
+export CXXFLAGS="${CXXFLAGS} ${STDCPP_CFLAGS}"
 
 # Print settings