summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackaging/coreclr.spec10
1 files changed, 6 insertions, 4 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 1b621d758b..2542b79e82 100755
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -153,8 +153,7 @@ export LD_LIBRARY_PATH=`pwd`/libicu-57.1
export TIZEN_ASAN_ENVIRONMENT=1
}
-export CFLAGS=" --target=%{_host} "
-export CXXFLAGS=" --target=%{_host} "
+BASE_FLAGS=" --target=%{_host} "
%ifarch x86_64
# Even though build architectur is x86_64, it will be running on arm board.
@@ -167,8 +166,8 @@ export CXXFLAGS=" --target=%{_host} "
%ifarch %{ix86}
%define _barch x86
export CLANG_NO_LIBDIR_SUFFIX=1
-export CFLAGS=$(echo $CFLAGS | sed -e 's/--target=i686/--target=i586/')
-export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/--target=i686/--target=i586/')
+BASE_FLAGS="$(echo $BASE_FLAGS | sed -e 's/--target=i686/--target=i586/')"
+BASE_FLAGS="$BASE_FLAGS -mstackrealign"
%else
%ifarch %{arm}
%define _barch armel
@@ -184,6 +183,9 @@ export CLANG_NO_LIBDIR_SUFFIX=1
%define _reldir bin/Product/Linux.%{_barch}.%{_buildtype}
%define _numproc %(getconf _NPROCESSORS_ONLN)
+export CFLAGS="${BASE_FLAGS}"
+export CXXFLAGS="${BASE_FLAGS}"
+
%ifarch %{arm}
%if %{dotnet_buildtype} == "Release"
export CXXFLAGS+="-fstack-protector-strong -D_FORTIFY_SOURCE=2"