From: Waldemar Kozaczuk <[email protected]>
Committer: Waldemar Kozaczuk <[email protected]>
Branch: master

aarch64: revert changes to make mkfs and cpiod with stdc++

This patch reverts some premature changes to make cpiod.so
and mkfs.so work with kernel built with most symbols hidden.
This will be addressed later as part of a bigger effort.

Signed-off-by: Waldemar Kozaczuk <[email protected]>

---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2037,11 +2037,11 @@ $(out)/empty_bootfs.o: ASFLAGS += -I$(out)
 
 $(out)/tools/mkfs/mkfs.so: $(out)/tools/mkfs/mkfs.o $(out)/libzfs.so
        $(makedir)
-       $(call quiet, $(CC) $(CFLAGS) -o $@ $(out)/tools/mkfs/mkfs.o -L$(out) 
-lzfs -lstdc++, LINK mkfs.so)
+       $(call quiet, $(CC) $(CFLAGS) -o $@ $(out)/tools/mkfs/mkfs.o -L$(out) 
-lzfs, LINK mkfs.so)
 
 $(out)/tools/cpiod/cpiod.so: $(out)/tools/cpiod/cpiod.o 
$(out)/tools/cpiod/cpio.o $(out)/libzfs.so
        $(makedir)
-       $(call quiet, $(CC) $(CFLAGS) -o $@ $(out)/tools/cpiod/cpiod.o 
$(out)/tools/cpiod/cpio.o -L$(out) -lzfs -lstdc++, LINK cpiod.so)
+       $(call quiet, $(CC) $(CFLAGS) -o $@ $(out)/tools/cpiod/cpiod.o 
$(out)/tools/cpiod/cpio.o -L$(out) -lzfs, LINK cpiod.so)
 
 
################################################################################
 # The dependencies on header files are automatically generated only after the

-- 
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/osv-dev/000000000000968e7b05d3bde0d6%40google.com.

Reply via email to