From: Kai Liu Date: Fri, 16 Aug 2013 23:39:23 +0000 (-0700) Subject: Remove PLATFORM_SHARED_CFLAGS when compiling .o files X-Git-Tag: v2.2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1635ea06c24e2a23477f0ea0cacf6244fc829c01;p=rocksdb.git Remove PLATFORM_SHARED_CFLAGS when compiling .o files Summary: The flags is accidentally introduced, and resulted in problems in 3rd party release. Test Plan: run make in all platforms (when doing the 3rd party release) --- diff --git a/Makefile b/Makefile index 9d5924bb..d16956dc 100644 --- a/Makefile +++ b/Makefile @@ -322,10 +322,10 @@ IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/versionCFBun else .cc.o: - $(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ $(COVERAGEFLAGS) + $(CXX) $(CXXFLAGS) -c $< -o $@ $(COVERAGEFLAGS) .c.o: - $(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ endif # ---------------------------------------------------------------------------