Mercurial > hg > truffle
changeset 12755:6a9f50777e6d
fixes building on MacOS for recent HSAIL changes
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 11 Nov 2013 22:44:41 +0100 |
| parents | 7311354f5bf8 |
| children | 70b138d008ff |
| files | make/bsd/makefiles/buildtree.make make/bsd/makefiles/vm.make |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/buildtree.make Mon Nov 11 21:43:03 2013 +0100 +++ b/make/bsd/makefiles/buildtree.make Mon Nov 11 22:44:41 2013 +0100 @@ -246,7 +246,9 @@ echo "$(call gamma-path,altsrc,os/posix/vm) \\"; \ echo "$(call gamma-path,commonsrc,os/posix/vm) \\"; \ echo "$(call gamma-path,altsrc,gpu/ptx/vm) \\"; \ - echo "$(call gamma-path,commonsrc,gpu/ptx/vm)"; \ + echo "$(call gamma-path,commonsrc,gpu/ptx/vm)" \\; \ + echo "$(call gamma-path,altsrc,gpu/hsail/vm) \\"; \ + echo "$(call gamma-path,commonsrc,gpu/hsail/vm)"; \ echo; \ echo "Src_Dirs_I = \\"; \ echo "$(call gamma-path,altsrc,share/vm/prims) \\"; \
--- a/make/bsd/makefiles/vm.make Mon Nov 11 21:43:03 2013 +0100 +++ b/make/bsd/makefiles/vm.make Mon Nov 11 22:44:41 2013 +0100 @@ -165,6 +165,7 @@ SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/ptx/vm +SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/hsail/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os_gpu/bsd_ptx/vm CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))