]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Fix Java Makefile v4.1
authorYueh-Hsuan Chiang <yhchiang@fb.com>
Tue, 17 Nov 2015 21:50:54 +0000 (13:50 -0800)
committerYueh-Hsuan Chiang <yhchiang@fb.com>
Tue, 17 Nov 2015 21:52:04 +0000 (13:52 -0800)
Summary:
In case rocksdb java package is built using make rocksdbjavastaticrelease, then
only those rocksdb binary built under the virtual environments is release build.

This patch fix this issue.

Test Plan:
PORTABLE=1 V=2 make rocksdbjavastaticrelease -j32
and make sure -O2 and -NDEBUG is included when compiling all source files.

Reviewers: sdong, anthony, IslamAbdelRahman, rven, kradhakrishnan, igor

Reviewed By: igor

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D50895

Makefile

index 009f4676ac634e20d7725b242037f1a866f3cadf..a98aa5b97285b1b3b7c3c64202f2de6a8405c1e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,14 @@ ifeq ($(MAKECMDGOALS),rocksdbjavastatic)
        DEBUG_LEVEL=0
 endif
 
+ifeq ($(MAKECMDGOALS),rocksdbjavastaticrelease)
+       DEBUG_LEVEL=0
+endif
+
+ifeq ($(MAKECMDGOALS),rocksdbjavastaticpublish)
+       DEBUG_LEVEL=0
+endif
+
 # compile with -O2 if debug level is not 2
 ifneq ($(DEBUG_LEVEL), 2)
 OPT += -O2 -fno-omit-frame-pointer