Linux compatibility tweaks

FiloSottile · Oct 6, 2014 · c85c3dd · c85c3dd
1 parent 48904b2
commit c85c3dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -22,3 +22,7 @@ btcd:
 
 addblock:
 	$(GO) install github.com/conformal/btcd/util/addblock
+
+clean:
+	-rm bin/*
+	$(MAKE) -C src/github.com/bitly/dablooms clean
diff --git a/src/blockchainr/main.go b/src/blockchainr/main.go
@@ -171,7 +171,7 @@ func getSignatures(maxHeigth int64, errorFile io.Writer, log btclog.Logger, db b
 func search(log btclog.Logger, db btcdb.Db, errorFile io.Writer) map[string][]*rData {
 	// Setup signal handler
 	signalChan := make(chan os.Signal, 1)
-	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGUSR1, syscall.SIGINFO)
+	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGUSR1)
 
 	filter := dablooms.NewScalingBloom(bloomSize, 0.01, "blockchainr_bloom.bin")
 	if filter == nil {

diff --git a/src/github.com/bitly/dablooms/Makefile b/src/github.com/bitly/dablooms/Makefile
@@ -113,7 +113,7 @@ $(BLDDIR)/libdablooms.a: $(OBJS_LIBDABLOOMS)
 
 $(BLDDIR)/libdablooms.$(SO_EXT): $(OBJS_LIBDABLOOMS)
 	@echo " SO " $@
-	@$(CC) -o $@ $(ALL_CFLAGS) $(SHARED_LDFLAGS) $(ALL_LDFLAGS) $^
+	@$(CC) -o $@ $^ $(ALL_CFLAGS) $(SHARED_LDFLAGS) $(ALL_LDFLAGS)
 
 $(patsubst %, $(BLDDIR)/%, $(LIB_SYMLNKS)): %: $(BLDDIR)/libdablooms.$(SO_EXT)
 	@echo " SYMLNK " $@
@@ -122,7 +122,7 @@ $(patsubst %, $(BLDDIR)/%, $(LIB_SYMLNKS)): %: $(BLDDIR)/libdablooms.$(SO_EXT)
 
 $(BLDDIR)/test_dablooms: $(OBJS_TESTS) $(BLDDIR)/libdablooms.a
 	@echo " LD " $@
-	@$(CC) -o $@ $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OBJS_TESTS) $(BLDDIR)/libdablooms.a
+	@$(CC) -o $@ $(OBJS_TESTS) $(BLDDIR)/libdablooms.a $(ALL_CFLAGS) $(ALL_LDFLAGS)
 
 test: $(BLDDIR)/test_dablooms
 	@$(BLDDIR)/test_dablooms $(BLDDIR)/testbloom.bin $(WORDS)