Fix to apply mthumb option to only arm

diff --git a/Makefile b/Makefile
index 98bf088e292e52f4dc3bbcff2d1d0ced5eb39731..cb22a93261d3f42727c80077f05a959b2bed8622 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ COMMON_FLAGS += -O2 -c \
 
 CXXFLAGS += $(USER_DEFINES) $(COMMON_FLAGS) $(shell pkg-config --cflags protobuf) \
        -std=c++11 -fno-exceptions -Wno-unused -Wno-unused-parameter
-LDFLAGS += -pie -Wl,-z,noexecstack -mthumb -lpthread $(shell pkg-config --libs protobuf)
+LDFLAGS += -pie -Wl,-z,noexecstack -lpthread $(shell pkg-config --libs protobuf)
 
 BIN = nsjail
 LIBS = kafel/libkafel.a

diff --git a/packaging/nsjail.spec b/packaging/nsjail.spec
index e9e7c81301ba7a62063204d0b656a43dfce70499..11837b8c12e612a6d006a7c6baa4e2b7b0c66aee 100644 (file)
--- a/packaging/nsjail.spec
+++ b/packaging/nsjail.spec
@@ -47,6 +47,9 @@ cp %{SOURCE1003} .
 %build
 export CFLAGS="$CFLAGS -DTIZEN"
 export CXXFLAGS="$CXXFLAGS -DTIZEN"
+%ifarch %{arm}
+export LDFLAGS="$LDFLAGS -mthumb"
+%endif
 make %{?_smp_mflags}
 
 pushd test