diff options
| author | amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-22 13:35:38 +0000 |
|---|---|---|
| committer | amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-22 13:35:38 +0000 |
| commit | 1fda33601e716093e074ab72f287f6992321ed62 (patch) | |
| tree | e8e77688f0a4c0c209ef99bb741123696ae9b58a /Makefile.def | |
| parent | ed7c2476b35f22ad276d45b7d8c10b0e5171f285 (diff) | |
| download | gcc-1fda33601e716093e074ab72f287f6992321ed62.tar.gz | |
PR libstdc++/36101, PR libstdc++/42813
[toplevel]:
* configure.ac (target_configdirs): Substitute.
* Makefile.def: Bootstrap target module libgomp.
Add dependency of all-target-libstdc++-v3 on configure-target-libgomp.
* Makefile.tpl (TARGET_CONFIGDIRS): New makefile variable.
(BASE_TARGET_EXPORTS): Export TARGET_CONFIGDIRS.
* configure, Makefile.in: Regenerate.
libstdc++-v3:
* acinclude.m4: (enable_parallel): Test ${TARGET_CONFIGDIRS} instead of
loking for omp.h .
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156172 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.def')
| -rw-r--r-- | Makefile.def | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.def b/Makefile.def index 5a05469086d..7dce69994cf 100644 --- a/Makefile.def +++ b/Makefile.def @@ -174,7 +174,7 @@ target_modules = { module= boehm-gc; }; target_modules = { module= qthreads; }; target_modules = { module= rda; }; target_modules = { module= libada; }; -target_modules = { module= libgomp; lib_path=.libs; }; +target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; // These are (some of) the make targets to be done in each subdirectory. // Not all; these are the ones which don't have special options. @@ -547,6 +547,10 @@ dependencies = { module=all-target-libobjc; on=all-target-libiberty; }; dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; }; dependencies = { module=all-target-libstdc++-v3; on=all-target-libiberty; }; dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; +// parallel_list.o and parallel_settings.o depend on omp.h, which is +// generated by the libgomp configure. Unfortunately, due to the use of +// recursive make, we can't be that specific. +dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; }; // Target modules in the 'src' repository. lang_env_dependencies = { module=examples; }; |