summaryrefslogtreecommitdiffstats
path: root/openmp/runtime
diff options
context:
space:
mode:
authorAndrey Churbanov <Andrey.Churbanov@intel.com>2015-01-29 15:37:15 +0000
committerAndrey Churbanov <Andrey.Churbanov@intel.com>2015-01-29 15:37:15 +0000
commit898a56eb273c72adde09863031244ce63561fcb9 (patch)
treeee00a049974b775eaa7f2b23d247118f6bef8f70 /openmp/runtime
parent96e833a6a6d4072af79c88aad6627b0c9e1cd31c (diff)
downloadbcm5719-llvm-898a56eb273c72adde09863031244ce63561fcb9.tar.gz
bcm5719-llvm-898a56eb273c72adde09863031244ce63561fcb9.zip
adding the jobs variable for parallel build
llvm-svn: 227447
Diffstat (limited to 'openmp/runtime')
-rw-r--r--openmp/runtime/Makefile9
-rw-r--r--openmp/runtime/README.txt4
-rw-r--r--openmp/runtime/tools/common.inc3
-rw-r--r--openmp/runtime/tools/src/common-rules.mk4
4 files changed, 16 insertions, 4 deletions
diff --git a/openmp/runtime/Makefile b/openmp/runtime/Makefile
index b1697e4f190..16d71ab6668 100644
--- a/openmp/runtime/Makefile
+++ b/openmp/runtime/Makefile
@@ -18,12 +18,12 @@ default: omp
all: omp stubs
omp: info mkdir
- @echo $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) lib inc common
- $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) lib inc common
+ @echo $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) lib inc common -- -j$(jobs)
+ $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) lib inc common -- -j$(jobs)
stubs: mkdir
- @echo $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) --stubs lib inc common
- $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) --stubs lib inc common
+ @echo $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) --stubs lib inc common -- -j$(jobs)
+ $(omp_root)/tools/build.pl $(build_args) --arch=$(arch) --mode=$(mode) --stubs lib inc common -- -j$(jobs)
.PHONY: clean info
@@ -45,4 +45,5 @@ endif
@echo compiler=$(compiler)
@echo mic=$(mic)
@echo mode=$(mode)
+ @echo jobs=$(jobs)
diff --git a/openmp/runtime/README.txt b/openmp/runtime/README.txt
index 1151000007c..a5cf6e46c74 100644
--- a/openmp/runtime/README.txt
+++ b/openmp/runtime/README.txt
@@ -65,6 +65,10 @@ compiler: Which compiler to use for the build. Defaults to "icc"
mode: Library mode: default is "release". Also supports "debug".
+jobs: The number of parallel jobs for the underlying call to make.
+ This value is sent as the parameter to the -j flag for make.
+ This value defaults to "1", but can be set to any positive integer.
+
To use any of the options above, simple add <option_name>=<value>. For
example, if you want to build with gcc instead of icc, type:
diff --git a/openmp/runtime/tools/common.inc b/openmp/runtime/tools/common.inc
index e80b68ffe6c..db6d2a98e9c 100644
--- a/openmp/runtime/tools/common.inc
+++ b/openmp/runtime/tools/common.inc
@@ -101,6 +101,9 @@ See the Tools tab at http://software.intel.com/mic-developer)
endif
endif
+# number of parallel build jobs
+jobs?=1
+
export BUILD_COMPILER := $(compiler)
diff --git a/openmp/runtime/tools/src/common-rules.mk b/openmp/runtime/tools/src/common-rules.mk
index a63aa0b5db1..44f97c22460 100644
--- a/openmp/runtime/tools/src/common-rules.mk
+++ b/openmp/runtime/tools/src/common-rules.mk
@@ -158,6 +158,10 @@ expand-vars = $(perl) $(tools_dir)expand-vars.pl --strict $(ev-flags) $< $@
endif
endif
+ifneq "$(pdb_file)" ""
+$(pdb_file) : $(lib_file)
+endif
+
%.dbg : %$(dll) .rebuild
$(target)
ifeq "$(arch)" "mic"
OpenPOWER on IntegriCloud