Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: Makefile.standalone

Issue 1215463014: Modify how textual bitcode is injected into pnacl-sz. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix issues in path set 3. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Makefile ('k') | src/IceBuildDefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index ccb202e5c5c26e8150a54fcf2e24f44e01c26776..c39b926194ce44754bf00b81434619e2562a4085 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -86,13 +86,6 @@ else
-DALLOW_MINIMAL_BUILD=0
endif
-ifdef TEXTUAL_BITCODE
- BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1
- OBJDIR := $(OBJDIR)+Tbc
-else
- BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=0
-endif
-
SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
@@ -238,11 +231,7 @@ endif
# SHOW_BUILD_ATTS is an executable that is run to show what build
# attributes were used to build pnacl-sz.
-ifdef TEXTUAL_BITCODE
- SHOW_BUILD_ATTS = echo "Can't show build attributes when TEXTUAL_BITCODE=1"
-else
- SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
-endif
+SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
# Creates symbolic link so that testing is easier. Also runs
# pnacl-sz to verify that the defines flags have valid values,
« no previous file with comments | « Makefile ('k') | src/IceBuildDefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698