Uncommit unintended part of previous change.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4289 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
parent
8727fe00af
commit
cdf6440197
6
Makefile
6
Makefile
@ -15,7 +15,6 @@ CFLAGS += \
|
|||||||
-Wno-cast-function-type \
|
-Wno-cast-function-type \
|
||||||
-MMD \
|
-MMD \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fmerge-all-constants \
|
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-g
|
-g
|
||||||
@ -56,12 +55,11 @@ $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
|
|||||||
$(NONANDROID_TARGETS): LDFLAGS += -rdynamic
|
$(NONANDROID_TARGETS): LDFLAGS += -rdynamic
|
||||||
$(ANDROID_TARGETS): CFLAGS += \
|
$(ANDROID_TARGETS): CFLAGS += \
|
||||||
--sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot \
|
--sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot \
|
||||||
|
-fPIC \
|
||||||
-fdebug-compilation-dir . \
|
-fdebug-compilation-dir . \
|
||||||
-fomit-frame-pointer \
|
-fomit-frame-pointer \
|
||||||
-fno-asynchronous-unwind-tables
|
-fno-asynchronous-unwind-tables
|
||||||
#-fPIC \
|
$(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC
|
||||||
$(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot
|
|
||||||
#-fPIC
|
|
||||||
$(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
|
$(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
|
||||||
$(RELEASE_TARGETS): CFLAGS += -DNDEBUG
|
$(RELEASE_TARGETS): CFLAGS += -DNDEBUG
|
||||||
$(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
|
$(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
|
||||||
|
BIN
deps/openssl/android/x86_64/usr/local/bin/openssl
vendored
BIN
deps/openssl/android/x86_64/usr/local/bin/openssl
vendored
Binary file not shown.
@ -919,7 +919,7 @@ static bool _tf_ssb_verify_and_strip_signature_internal(JSContext* context, JSVa
|
|||||||
if (!verified)
|
if (!verified)
|
||||||
{
|
{
|
||||||
//tf_printf("crypto_sign_verify_detached fail (r=%d)\n", r);
|
//tf_printf("crypto_sign_verify_detached fail (r=%d)\n", r);
|
||||||
if (true)
|
if (false)
|
||||||
{
|
{
|
||||||
tf_printf("val=[%.*s]\n", (int)strlen(sigstr), sigstr);
|
tf_printf("val=[%.*s]\n", (int)strlen(sigstr), sigstr);
|
||||||
tf_printf("sig=%.*s\n", (int)(sigkind - str), str);
|
tf_printf("sig=%.*s\n", (int)(sigkind - str), str);
|
||||||
|
Loading…
Reference in New Issue
Block a user