blob: 4645849ffc951710ea27045eb05cc19547ca088b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
https://bugs.gentoo.org/433435
http://gcc.gnu.org/PR54725
http://gcc.gnu.org/viewcvs?view=revision&revision=192650
make sure gfortran respects the sysroot
gcc/
2012-10-21 Tobias Burnus <burnus@net-b.de>
PR fortran/54725
* Makefile.in (TARGET_SYSTEM_ROOT_DEFINE): New.
gcc/fortran
2012-10-21 Tobias Burnus <burnus@net-b.de>
PR fortran/54725
* Make-lang.in (CFLAGS-cpp.o): Use TARGET_SYSTEM_ROOT_DEFINE.
* cpp.o (gfc_cpp_init_options): Use it for
setting gfc_cpp_option.sysroot.
--- trunk/gcc/Makefile.in 2012/10/21 10:32:02 192649
+++ trunk/gcc/Makefile.in 2012/10/21 10:51:26 192650
@@ -468,6 +468,7 @@
# Directory for prefix to system directories, for
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
+TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
xmake_file=@xmake_file@
tmake_file=@tmake_file@
--- trunk/gcc/fortran/Make-lang.in 2012/10/21 10:32:02 192649
+++ trunk/gcc/fortran/Make-lang.in 2012/10/21 10:51:26 192650
@@ -341,6 +341,7 @@
$(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TM_H) coretypes.h $(GGC_H) \
fortran/iso-c-binding.def fortran/iso-fortran-env.def
+CFLAGS-fortran/cpp.o += $(TARGET_SYSTEM_ROOT_DEFINE)
fortran/f95-lang.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \
gt-fortran-f95-lang.h gtype-fortran.h $(CGRAPH_H) $(TARGET_H) fortran/cpp.h \
$(BUILTINS_DEF) fortran/types.def \
--- trunk/gcc/fortran/cpp.c 2012/10/21 10:32:02 192649
+++ trunk/gcc/fortran/cpp.c 2012/10/21 10:51:26 192650
@@ -38,6 +38,10 @@
#include "cppbuiltin.h"
#include "mkdeps.h"
+#ifndef TARGET_SYSTEM_ROOT
+# define TARGET_SYSTEM_ROOT NULL
+#endif
+
#ifndef TARGET_CPU_CPP_BUILTINS
# define TARGET_CPU_CPP_BUILTINS()
#endif
@@ -267,7 +271,7 @@
gfc_cpp_option.multilib = NULL;
gfc_cpp_option.prefix = NULL;
- gfc_cpp_option.sysroot = NULL;
+ gfc_cpp_option.sysroot = TARGET_SYSTEM_ROOT;
gfc_cpp_option.deferred_opt = XNEWVEC (gfc_cpp_deferred_opt_t,
decoded_options_count);
|
GitWeb
