Skip to content

Commit

Permalink
OS X build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Ondov committed Feb 5, 2015
1 parent daef7d3 commit 25ae45a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ifeq ($(UNAME_S),Darwin)
CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
else
CXXFLAGS += -include src/harvest/memcpyLink.h -L. -static-libstdc++ -Wl,--wrap=memcpy
CFLAGS += -include src/harvest/memcpyLink.h
endif

SOURCES=\
Expand Down Expand Up @@ -43,7 +44,7 @@ libharvest.a : $(OBJECTS)
$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<

src/harvest/memcpyWrap.o : src/harvest/memcpyWrap.c
$(CC) -include src/harvest/memcpyLink.h -c -o $@ $<
$(CC) -c -o $@ $<

src/harvest/pb/harvest.pb.cc src/harvest/pb/harvest.pb.h : src/harvest/pb/harvest.proto
cd src; @protobuf@/bin/protoc --cpp_out . harvest/pb/harvest.proto
Expand Down

0 comments on commit 25ae45a

Please sign in to comment.