Remove mentions of libformat, it no longer exists
				
					
				
			This commit is contained in:
		
							parent
							
								
									e10d6ed2a7
								
							
						
					
					
						commit
						fef9f5653b
					
				
					 6 changed files with 5 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -6,7 +6,7 @@ libexpr_DIR := $(d)
 | 
			
		|||
 | 
			
		||||
libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc
 | 
			
		||||
 | 
			
		||||
libexpr_LIBS = libutil libstore libformat
 | 
			
		||||
libexpr_LIBS = libutil libstore
 | 
			
		||||
 | 
			
		||||
libexpr_LDFLAGS =
 | 
			
		||||
ifneq ($(OS), FreeBSD)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ libmain_SOURCES := $(wildcard $(d)/*.cc)
 | 
			
		|||
 | 
			
		||||
libmain_LDFLAGS = $(OPENSSL_LIBS)
 | 
			
		||||
 | 
			
		||||
libmain_LIBS = libstore libutil libformat
 | 
			
		||||
libmain_LIBS = libstore libutil
 | 
			
		||||
 | 
			
		||||
libmain_ALLOW_UNDEFINED = 1
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ libstore_DIR := $(d)
 | 
			
		|||
 | 
			
		||||
libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc)
 | 
			
		||||
 | 
			
		||||
libstore_LIBS = libutil libformat
 | 
			
		||||
libstore_LIBS = libutil
 | 
			
		||||
 | 
			
		||||
libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
 | 
			
		||||
ifneq ($(OS), FreeBSD)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,5 +7,3 @@ libutil_DIR := $(d)
 | 
			
		|||
libutil_SOURCES := $(wildcard $(d)/*.cc)
 | 
			
		||||
 | 
			
		||||
libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context
 | 
			
		||||
 | 
			
		||||
libutil_LIBS = libformat
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ nix_SOURCES := \
 | 
			
		|||
  $(wildcard src/nix-prefetch-url/*.cc) \
 | 
			
		||||
  $(wildcard src/nix-store/*.cc) \
 | 
			
		||||
 | 
			
		||||
nix_LIBS = libexpr libmain libstore libutil libformat
 | 
			
		||||
nix_LIBS = libexpr libmain libstore libutil
 | 
			
		||||
 | 
			
		||||
nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,6 +6,6 @@ resolve-system-dependencies_DIR := $(d)
 | 
			
		|||
 | 
			
		||||
resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix
 | 
			
		||||
 | 
			
		||||
resolve-system-dependencies_LIBS := libstore libmain libutil libformat
 | 
			
		||||
resolve-system-dependencies_LIBS := libstore libmain libutil
 | 
			
		||||
 | 
			
		||||
resolve-system-dependencies_SOURCES := $(d)/resolve-system-dependencies.cc
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue