make/common/BuildNativePackages.gmk

Print this page

        

@@ -27,11 +27,18 @@
 # Generate jmod and debian packages for all jdk modules
 #
 PKGS = $(ABS_OUTPUTDIR)/jigsaw-pkgs
 JMOD_PKGS = $(PKGS)/jmod
 DEB_PKGS = $(PKGS)/deb
+JPKG_ARGS = -os $(PLATFORM)
 
+ifneq ($(CROSS_COMPILE_ARCH), )
+  JPKG_ARGS += -arch $(CROSS_COMPILE_ARCH)
+else
+  JPKG_ARGS += -arch $(ARCH)
+endif
+
 ## TODO: generate packages for modules that are modified
 ##       instead of all modules
 $(PKGS)/%:
         $(RM) -r $@
         $(MKDIR) -p $@

@@ -64,11 +71,11 @@
                fi ; \
                if [ -d etc ] ; then \
                    CONFIG="-config etc" ; \
                fi ; \
                $(HOST_JPKG_CMD) -v -m classes \
-                  $$NATCMD $$NATLIB $$CONFIG $(SIGNER_ARGS) \
+                  $$NATCMD $$NATLIB $$CONFIG $(JPKG_ARGS) $(SIGNER_ARGS) \
                   -d $(JMOD_PKGS) jmod $$m $(SIGNER_PW)) || exit 1 ; \
         done
         @$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
 
 # Rules to generate debian packages