diff --git a/bssl/Makefile.aarch64 b/bssl/Makefile.aarch64 index 97e6af1..e48c800 100644 --- a/bssl/Makefile.aarch64 +++ b/bssl/Makefile.aarch64 @@ -19,9 +19,9 @@ prepare: clean -DCMAKE_BUILD_TYPE=Release \ -DANDROID_ABI=arm64-v8a \ -DOPENSSL_SMALL=1 \ - -DCMAKE_C_FLAGS_RELEASE="-Os -fdata-sections" \ - -DCMAKE_CXX_FLAGS_RELEASE="-Os -fdata-sections" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections" \ + -DCMAKE_C_FLAGS_RELEASE="-Os -fdata-sections -Wno-error=unused-command-line-argument" \ + -DCMAKE_CXX_FLAGS_RELEASE="-Os -fdata-sections -Wno-error=unused-command-line-argument" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections -Wno-error=unused-command-line-argument" \ .. build: cd $(BUILD_DIR); \ diff --git a/bssl/Makefile.native b/bssl/Makefile.native index 17b9f93..8598c52 100644 --- a/bssl/Makefile.native +++ b/bssl/Makefile.native @@ -10,11 +10,13 @@ prepare: mkdir -p $(BUILD_DIR) cd $(BUILD_DIR); \ cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Release \ -DOPENSSL_SMALL=1 \ -DCMAKE_C_FLAGS_RELEASE="-Os -fdata-sections" \ -DCMAKE_CXX_FLAGS_RELEASE="-Os -fdata-sections" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections" \ .. + build: cd $(BUILD_DIR); \ $(MAKE) - python ~/print_bssl_size.py " -fdata-sections (+)" diff --git a/common.mk b/common.mk index 7d5018c..95412d5 100644 --- a/common.mk +++ b/common.mk @@ -1,5 +1,5 @@ # Constants and makefile shit used in build mkfile_path = $(abspath $(lastword $(MAKEFILE_LIST))) current_dir = $(notdir $(patsubst %/,%,$(dir $(mkfile_path)))) -ANDROID_NDK = /home/hdc/android-ndk-r16b +ANDROID_NDK = /opt/android-ndk NDK_TARGETVER = 27 diff --git a/testapp/Makefile.native b/testapp/Makefile.native index 3940f81..52283f5 100644 --- a/testapp/Makefile.native +++ b/testapp/Makefile.native @@ -17,7 +17,7 @@ CC=clang CFLAGS_COMMON=-std=c99 $(DEBUG) BORINGSSL_CFLAGS=$(CFLAGS_COMMON) -I$(BORINGSSL_DIR)/ -I$(BORINGSSL_DIR)/include -BORINGSSL_LDFLAGS=-L$(BORINGSSL_LIB)/crypto -L$(BORINGSSL_LIB)/ssl -lssl -lcrypto -lpthread +BORINGSSL_LDFLAGS=-L$(BORINGSSL_LIB)/crypto -L$(BORINGSSL_LIB)/ssl -lssl -lcrypto -lpthread -Wl,--gc-sections MBEDTLS_CFLAGS=$(CFLAGS_COMMON) -I$(MBEDTLS_DIR)/include MBEDTLS_LDFLAGS=-L$(MBEDTLS_DIR)/library -lmbedx509 -lmbedtls -lmbedcrypto SRCDIR=src