diff mbox series

package/memtester: fix compile and link flags

Message ID f9ae74a3f5657230a29cb3133d747a77a58ae435.1612775074.git.baruch@tkos.co.il
State Accepted
Headers show
Series package/memtester: fix compile and link flags | expand

Commit Message

Baruch Siach Feb. 8, 2021, 9:04 a.m. UTC
The memtester build system does not use CFLAGS/LDFLAGS variables.
Everything should be written to conf-cc and conf-ld.

Use '%' as sed expression delimiter because comma might appear in
LDFLAGS.

Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/memtester/memtester.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Peter Korsgaard Feb. 8, 2021, 3:24 p.m. UTC | #1
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > The memtester build system does not use CFLAGS/LDFLAGS variables.
 > Everything should be written to conf-cc and conf-ld.

 > Use '%' as sed expression delimiter because comma might appear in
 > LDFLAGS.

 > Cc: Matt Weber <matthew.weber@rockwellcollins.com>
 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed, thanks.
Peter Korsgaard Feb. 10, 2021, 7:54 p.m. UTC | #2
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > The memtester build system does not use CFLAGS/LDFLAGS variables.
 > Everything should be written to conf-cc and conf-ld.

 > Use '%' as sed expression delimiter because comma might appear in
 > LDFLAGS.

 > Cc: Matt Weber <matthew.weber@rockwellcollins.com>
 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed to 2020.11.x, thanks.
diff mbox series

Patch

diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index 49cc935f3966..ec515f63927f 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -13,8 +13,9 @@  MEMTESTER_CPE_ID_VENDOR = pryopus
 MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr
 
 define MEMTESTER_BUILD_CMDS
-	$(SED) "s,^cc,$(TARGET_CC)," $(@D)/conf-*
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(SED) "s%^cc%$(TARGET_CC) $(TARGET_CFLAGS)%" $(@D)/conf-cc
+	$(SED) "s%^cc%$(TARGET_CC) $(TARGET_LDFLAGS)%" $(@D)/conf-ld
+	$(MAKE) -C $(@D)
 endef
 
 define MEMTESTER_INSTALL_TARGET_CMDS