[openwrt/openwrt] openssl: use --cross-compile-prefix in Configure

LEDE Commits lede-commits at lists.infradead.org
Sun Dec 6 12:32:25 EST 2020


dedeckeh pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2f75348923e564f1b73fbc32f7cabc355cd6e2b9

commit 2f75348923e564f1b73fbc32f7cabc355cd6e2b9
Author: Eneas U de Queiroz <cotequeiroz at gmail.com>
AuthorDate: Sat Nov 28 18:06:33 2020 -0300

    openssl: use --cross-compile-prefix in Configure
    
    This sets the --cross-compile-prefix option when running Configure, so
    that that it will not use the host gcc to figure out, among other
    things, compiler defines.  It avoids errors, if the host 'gcc' is
    handled by clang:
    
    mips-openwrt-linux-musl-gcc: error: unrecognized command-line option
    '-Qunused-arguments'
    
    Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
    Tested-by: Rosen Penev <rosenp at gmail.com>
---
 package/libs/openssl/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 9696748106..77c6d41cec 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=openssl
 PKG_BASE:=1.1.1
 PKG_BUGFIX:=h
 PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 ENGINES_DIR=engines-1.1
 
@@ -333,6 +333,7 @@ define Build/Configure
 			--prefix=/usr \
 			--libdir=lib \
 			--openssldir=/etc/ssl \
+			--cross-compile-prefix="$(TARGET_CROSS)" \
 			$(TARGET_CPPFLAGS) \
 			$(TARGET_LDFLAGS) \
 			$(OPENSSL_OPTIONS) && \
@@ -345,14 +346,12 @@ TARGET_LDFLAGS += -Wl,--gc-sections
 
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
 		SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
 		OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
 		$(OPENSSL_MAKEFLAGS) \
 		all
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		$(OPENSSL_MAKEFLAGS) \



More information about the lede-commits mailing list