fix tizen compile issue

antidotcb · Feb 9, 2017 · 91173d9 · 91173d9
1 parent 190e050
commit 91173d9
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/contrib/src/openssl/rules.mak b/contrib/src/openssl/rules.mak
@@ -30,7 +30,13 @@ endif
 endif
 
 ifdef HAVE_TIZEN
-OPENSSL_COMPILER=os/compiler:arm-linux-gnueabi-
+ifeq ($(MY_TARGET_ARCH),x86)
+OPENSSL_CONFIG_VARS=linux-elf
+OPENSSL_ARCH=-m32
+endif
+ifeq ($(MY_TARGET_ARCH),armv7)
+OPENSSL_CONFIG_VARS=linux-generic32
+endif
 endif
 
 ifdef HAVE_ANDROID
@@ -116,13 +122,10 @@ $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
 
 openssl: openssl-$(OPENSSL_VERSION).tar.gz .sum-openssl
 	$(UNPACK)
-ifdef HAVE_TIZEN
-	$(APPLY) $(SRC)/openssl/tizen.patch
-endif
 	$(MOVE)
 
 .openssl: openssl
-	cd $< && $(HOSTVARS_PIC) ./Configure $(OPENSSL_CONFIG_VARS) --prefix=$(PREFIX) $(OPENSSL_COMPILER) ${OPENSSL_ARCH} $(OPENSSL_EXTRA_CONFIG_1) $(OPENSSL_EXTRA_CONFIG_2)
+	cd $< && $(HOSTVARS_PIC) ./Configure $(OPENSSL_CONFIG_VARS) --prefix=$(PREFIX) ${OPENSSL_ARCH} $(OPENSSL_EXTRA_CONFIG_1) $(OPENSSL_EXTRA_CONFIG_2)
 ifdef HAVE_IOS
 	cd $< && perl -i -pe "s|^CFLAGS=(.*) -DNDEBUG (.*)-O3|CFLAGS=\\1 \\2 ${OPTIM} ${ENABLE_BITCODE}|g" Makefile
 	cd $< && perl -i -pe "s|^CFLAGS_Q=(.*) -DNDEBUG (.*)|CFLAGS_Q=\\1 \\2 ${OPTIM} ${ENABLE_BITCODE}|g" Makefile