Mercurial > hg > truffle

changeset 14531:4c9f24b8f002

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
undo accidentially pushed make/Makefile changes
author twisti
date Thu, 13 Mar 2014 13:38:02 -0700
parents d87b84dade7d
children a300322b782b 47b775458982
files make/Makefile
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/Makefile	Wed Mar 12 17:33:51 2014 -0700
+++ b/make/Makefile	Thu Mar 13 13:38:02 2014 -0700
@@ -307,7 +307,7 @@
 
 # Builds code that can be shared among different build flavors
 buildshared:
-#	python2.7 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
+	python2.7 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
 
 # Export file rule
 generic_export: $(EXPORT_LIST)
@@ -315,11 +315,11 @@
 export_product:
 	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
 export_fastdebug:
-	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
+	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
 export_debug:
-	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
+	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
 export_optimized:
-	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
+	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
 
 export_product_jdk::
 	$(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export