# HG changeset patch # User twisti # Date 1394743082 25200 # Node ID 4c9f24b8f002cd4e3887e47960f90a30821e0e58 # Parent d87b84dade7dcaee4704bb80fc6ff91b14662917 undo accidentially pushed make/Makefile changes diff -r d87b84dade7d -r 4c9f24b8f002 make/Makefile --- 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