[osx/ios] changed how env set flags are passed

4 files changed, 16 insertions, 16 deletions

diff --git a/tools/darwin/depends/config.site_ios.in b/tools/darwin/depends/config.site_ios.in
index 84c599d627..cd6dbef749 100755
--- a/tools/darwin/depends/config.site_ios.in
+++ b/tools/darwin/depends/config.site_ios.in
@@ -12,13 +12,13 @@ platform_sdk_path="${platform_path}/SDKs/iPhoneOS${platform_sdk_version}.sdk"
 export NM=/usr/bin/nm
 export CPP=/usr/bin/cpp-${platform_gcc_version}
 export CXXCPP=${CPP}
-export CPPFLAGS+="-no-cpp-precomp -I${prefix}/include"
+export CPPFLAGS="${CPPFLAGS} -no-cpp-precomp -I${prefix}/include"
 export CC=${platform_path}/usr/bin/gcc-${platform_gcc_version}
-export CFLAGS+="-std=gnu99 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -I${platform_sdk_path}/usr/include"
+export CFLAGS="${CFLAGS} -std=gnu99 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -I${platform_sdk_path}/usr/include"
 export LD=${platform_path}/usr/bin/ld
-export LDFLAGS+="-m${platform_min_version} -isysroot ${platform_sdk_path} -L${platform_sdk_path}/usr/lib -L${platform_sdk_path}/usr/lib/system ${platform_os_ldflags} -L${prefix}/lib"
+export LDFLAGS="${LDFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} -L${platform_sdk_path}/usr/lib -L${platform_sdk_path}/usr/lib/system ${platform_os_ldflags} -L${prefix}/lib"
 export CXX=${platform_path}/usr/bin/g++-${platform_gcc_version}
-export CXXFLAGS+="-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
+export CXXFLAGS="${CXXFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
 export AR=${platform_path}/usr/bin/ar
 export AS="@use_toolchain@/bin/gas-preprocessor.pl ${CC}"
 export M4=@use_toolchain@/bin/m4
diff --git a/tools/darwin/depends/config.site_ios.mk.in b/tools/darwin/depends/config.site_ios.mk.in
index f479f37ce8..c9cf287b25 100755
--- a/tools/darwin/depends/config.site_ios.mk.in
+++ b/tools/darwin/depends/config.site_ios.mk.in
@@ -12,13 +12,13 @@ platform_sdk_path=${platform_path}/SDKs/iPhoneOS${platform_sdk_version}.sdk
 export NM=/usr/bin/nm
 export CPP=/usr/bin/cpp-${platform_gcc_version}
 export CXXCPP=${CPP}
-export CPPFLAGS+=-no-cpp-precomp -I${PREFIX}/include
+export CPPFLAGS=${CPPFLAGS} -no-cpp-precomp -I${PREFIX}/include
 export CC=${platform_path}/usr/bin/gcc-${platform_gcc_version}
-export CFLAGS+=-std=gnu99 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -I${platform_sdk_path}/usr/include
+export CFLAGS=${CFLAGS} -std=gnu99 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags} -I${platform_sdk_path}/usr/include
 export LD=${platform_path}/usr/bin/ld
-export LDFLAGS+=-m${platform_min_version} -isysroot ${platform_sdk_path} -L${platform_sdk_path}/usr/lib -L${platform_sdk_path}/usr/lib/system ${platform_os_ldflags} -L${PREFIX}/lib
+export LDFLAGS=${LDFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} -L${platform_sdk_path}/usr/lib -L${platform_sdk_path}/usr/lib/system ${platform_os_ldflags} -L${PREFIX}/lib
 export CXX=${platform_path}/usr/bin/g++-${platform_gcc_version}
-export CXXFLAGS+=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}
+export CXXFLAGS=${CXXFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}
 export AR=${platform_path}/usr/bin/ar
 export AS=@use_toolchain@/bin/gas-preprocessor.pl ${CC}
 export CCAS=--tag CC @use_toolchain@/bin/gas-preprocessor.pl ${CC}
diff --git a/tools/darwin/depends/config.site_osx.in b/tools/darwin/depends/config.site_osx.in
index 85335d9352..c92154fc4d 100644
--- a/tools/darwin/depends/config.site_osx.in
+++ b/tools/darwin/depends/config.site_osx.in
@@ -22,13 +22,13 @@ platform_sdk_path="${platform_path}/SDKs/MacOSX${platform_sdk_version}.sdk"
 export NM=/usr/bin/nm
 export CPP=/usr/bin/cpp-${platform_gcc_version}
 export CXXCPP=${CPP}
-export CPPFLAGS+="-no-cpp-precomp -I${prefix}/include"
+export CPPFLAGS="${CPPFLAGS} -no-cpp-precomp -I${prefix}/include"
 export CC=/usr/bin/gcc-${platform_gcc_version}
-export CFLAGS+="-std=gnu89 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
+export CFLAGS="${CFLAGS} -std=gnu89 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
 export LD=${platform_path}/usr/bin/ld
-export LDFLAGS+="-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_ldflags} -L${prefix}/lib"
+export LDFLAGS="${LDFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_ldflags} -L${prefix}/lib"
 export CXX=/usr/bin/g++-${platform_gcc_version}
-export CXXFLAGS+="-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
+export CXXFLAGS="${CXXFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}"
 export AR=${platform_path}/usr/bin/ar
 export AS=${platform_path}/usr/bin/as
 export M4=@use_toolchain@/bin/m4
diff --git a/tools/darwin/depends/config.site_osx.mk.in b/tools/darwin/depends/config.site_osx.mk.in
index e046977f2f..07dde59443 100644
--- a/tools/darwin/depends/config.site_osx.mk.in
+++ b/tools/darwin/depends/config.site_osx.mk.in
@@ -21,13 +21,13 @@ platform_sdk_path=${platform_path}/SDKs/MacOSX${platform_sdk_version}.sdk
 export NM=/usr/bin/nm
 export CPP=/usr/bin/cpp-${platform_gcc_version}
 export CXXCPP=${CPP}
-export CPPFLAGS+=-no-cpp-precomp -I${PREFIX}/include
+export CPPFLAGS=${CPPFLAGS} -no-cpp-precomp -I${PREFIX}/include"
 export CC=/usr/bin/gcc-${platform_gcc_version}
-export CFLAGS+=-std=gnu89 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}
+export CFLAGS=${CFLAGS} -std=gnu89 -no-cpp-precomp -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}
 export LD=${platform_path}/usr/bin/ld
-export LDFLAGS+=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_ldflags} -L${PREFIX}/lib
+export LDFLAGS=${LDFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_ldflags} -L${PREFIX}/lib
 export CXX=/usr/bin/g++-${platform_gcc_version}
-export CXXFLAGS+=-m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}
+export CXXFLAGS=${CXXFLAGS} -m${platform_min_version} -isysroot ${platform_sdk_path} ${platform_os_cflags}
 export AR=${platform_path}/usr/bin/ar
 export AS=${platform_path}/usr/bin/as
 export STRIP=${platform_path}/usr/bin/strip