blob: b4a58e6482be492b43b90d3e5dd8f7d2f12ef6ec (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
--- a/Makefile
+++ b/Makefile
@@ -124,11 +124,7 @@
$(CXX) $(CXXFLAGS) -c $< -o $@
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
- # Workaround for strip Protocol error when using VirtualBox on Mac
- cp $@ /tmp/$(@F)
- $(STRIP) /tmp/$(@F)
- cp /tmp/$(@F) $@
+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle $(LDFLAGS)
clean-native:
rm -rf $(SNAPPY_OUT)
--- a/Makefile.common
+++ b/Makefile.common
@@ -274,8 +274,8 @@
CXX := $($(os_arch)_CXX)
STRIP := $($(os_arch)_STRIP)
-CXXFLAGS := $($(os_arch)_CXXFLAGS)
-LINKFLAGS := $($(os_arch)_LINKFLAGS)
+CXXFLAGS := $($(os_arch)_CXXFLAGS) $(CXXFLAGS)
+LINKFLAGS := $($(os_arch)_LINKFLAGS) $(LDFLAGS)
LIBNAME := $($(os_arch)_LIBNAME)
SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS)
|
