Edward O'Callaghan has uploaded this change for review.

View Change

build: Remove cli_classic need for internal symbols [WIP]

cli_classic should now only use the libflashrom interface.

BUG=b:208132085
TEST=`make && meson/ninja`.

Change-Id: Ib04293c14f53c8e798c7d3e35483067520668161
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M Makefile
M meson.build
2 files changed, 2 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/74/60074/1

diff --git a/Makefile b/Makefile
index b196d98..ecffcd6 100644
--- a/Makefile
+++ b/Makefile
@@ -865,8 +865,8 @@
 	@+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS)
 endif
 
-$(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
+$(PROGRAM)$(EXEC_SUFFIX): $(CLI_OBJS) libflashrom.a
+	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(CLI_OBJS) libflashrom.a $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
 
 libflashrom.a: $(LIBFLASHROM_OBJS)
 	$(AR) rcs $@ $^
diff --git a/meson.build b/meson.build
index 85f40ba..73ce68d 100644
--- a/meson.build
+++ b/meson.build
@@ -470,7 +470,6 @@
 
 cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS="' + config_default_programmer_args + '"'
 
-# we can't just link_with libflashrom as we require all the internal symbols...
 executable(
   'flashrom',
   sources : [
@@ -478,7 +477,6 @@
     'cli_classic.c',
     'cli_common.c',
     'cli_output.c',
-    'flashrom.c',
   ],
   dependencies : [
     deps,

To view, visit change 60074. To unsubscribe, or for help writing mail filters, visit settings.