diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-25 16:15:59 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-25 16:15:59 +0000 |
| commit | 96da1c1da9e150f4e05f82a56325a5ef31735ad3 (patch) | |
| tree | eec5aa181a5c652e670d10c0809b76cea2331765 /gcc/Makefile.in | |
| parent | e7c8aa66d3b4b615a7a79c92c42307f0f8cd7a50 (diff) | |
| download | gcc-96da1c1da9e150f4e05f82a56325a5ef31735ad3.tar.gz | |
* Makefile.in (DRIVER_DEFINES): Use $(and), not shell code,
to add -DENABLE_SHARED_LIBGCC.
(gcc.o): Don't use subshell.
gcc/c
* Make-lang.in (c/gccspec.o): Don't use subshell.
gcc/cp
* Make-lang.in (g++spec.o): Don't use subshell.
gcc/fortran
* Make-lang.in (gfortranspec.o): Don't use subshell.
gcc/go
* Make-lang.in (gospec.o): Don't use subshell.
gcc/java
* Make-lang.in (jvspec.o): Don't use subshell.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202897 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 154fe241750..a3ae57b43c1 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2089,16 +2089,15 @@ DRIVER_DEFINES = \ -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \ @TARGET_SYSTEM_ROOT_DEFINE@ \ $(VALGRIND_DRIVER_DEFINES) \ - `test "X$${SHLIB}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \ + $(and $(SHLIB),$(filter yes,@enable_shared@),-DENABLE_SHARED_LIBGCC) \ -DCONFIGURE_SPECS="\"@CONFIGURE_SPECS@\"" gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h multilib.h \ Makefile $(lang_specs_files) specs.h prefix.h $(GCC_H) $(FLAGS_H) \ configargs.h $(OBSTACK_H) $(OPTS_H) $(DIAGNOSTIC_H) $(VEC_H) $(PARAMS_H) - (SHLIB='$(SHLIB)'; \ $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ $(DRIVER_DEFINES) \ - -c $(srcdir)/gcc.c $(OUTPUT_OPTION)) + -c $(srcdir)/gcc.c $(OUTPUT_OPTION) specs.h : s-specs ; @true s-specs : Makefile |