OLD | NEW |
1 diff --git a/F2CLIBS/libf2c/Makefile b/F2CLIBS/libf2c/Makefile | 1 diff --git a/F2CLIBS/libf2c/Makefile b/F2CLIBS/libf2c/Makefile |
2 --- a/F2CLIBS/libf2c/Makefile | 2 --- a/F2CLIBS/libf2c/Makefile |
3 +++ b/F2CLIBS/libf2c/Makefile | 3 +++ b/F2CLIBS/libf2c/Makefile |
4 @@ -20,7 +20,7 @@ include $(TOPDIR)/make.inc | 4 @@ -20,8 +20,10 @@ include $(TOPDIR)/make.inc |
5 # compile, then strip unnecessary symbols | 5 # compile, then strip unnecessary symbols |
6 .c.o: | 6 .c.o: |
7 $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c | 7 $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c |
8 - ld -r -x -o $*.xxx $*.o | 8 - ld -r -x -o $*.xxx $*.o |
9 +» $(LOADER) ${LDEMULATION} -r -o $*.xxx $*.o | 9 -» mv $*.xxx $*.o |
10 » mv $*.xxx $*.o | 10 +» if [ $(NACL_ARCH) != le32 ]; then \ |
| 11 +» » $(LOADER) ${LDEMULATION} -r -o $*.xxx $*.o; \ |
| 12 +» » mv $*.xxx $*.o;\ |
| 13 +» fi |
11 ## Under Solaris (and other systems that do not understand ld -x), | 14 ## Under Solaris (and other systems that do not understand ld -x), |
12 ## omit -x in the ld line above. | 15 ## omit -x in the ld line above. |
13 @@ -72,8 +72,8 @@ OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \ | 16 ## If your system does not have the ld command, comment out |
| 17 @@ -72,8 +74,8 @@ OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \ |
14 all: f2c.h signal1.h sysdep1.h libf2c.a clapack_install | 18 all: f2c.h signal1.h sysdep1.h libf2c.a clapack_install |
15 | 19 |
16 libf2c.a: $(OFILES) | 20 libf2c.a: $(OFILES) |
17 - ar r libf2c.a $? | 21 - ar r libf2c.a $? |
18 - -ranlib libf2c.a | 22 - -ranlib libf2c.a |
19 + $(ARCH) r libf2c.a $? | 23 + $(ARCH) r libf2c.a $? |
20 + -$(RANLIB) libf2c.a | 24 + -$(RANLIB) libf2c.a |
21 | 25 |
22 ## Shared-library variant: the following rule works on Linux | 26 ## Shared-library variant: the following rule works on Linux |
23 ## systems. Details are system-dependent. Under Linux, -fPIC | 27 ## systems. Details are system-dependent. Under Linux, -fPIC |
24 @@ -119,7 +119,7 @@ sysdep1.h: sysdep1.h0 | 28 @@ -119,7 +121,7 @@ sysdep1.h: sysdep1.h0 |
25 | 29 |
26 install: libf2c.a | 30 install: libf2c.a |
27 cp libf2c.a $(LIBDIR) | 31 cp libf2c.a $(LIBDIR) |
28 - -ranlib $(LIBDIR)/libf2c.a | 32 - -ranlib $(LIBDIR)/libf2c.a |
29 + -$(RANLIB) $(LIBDIR)/libf2c.a | 33 + -$(RANLIB) $(LIBDIR)/libf2c.a |
30 | 34 |
31 clapack_install: libf2c.a | 35 clapack_install: libf2c.a |
32 mv libf2c.a .. | 36 mv libf2c.a .. |
33 @@ -181,9 +181,11 @@ xwsne.o:» fio.h | 37 @@ -181,9 +183,11 @@ xwsne.o:» fio.h |
34 xwsne.o: lio.h | 38 xwsne.o: lio.h |
35 xwsne.o: fmt.h | 39 xwsne.o: fmt.h |
36 | 40 |
37 +BUILD_CC ?= $(CC) | 41 +BUILD_CC ?= $(CC) |
38 + | 42 + |
39 arith.h: arithchk.c | 43 arith.h: arithchk.c |
40 - $(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ | 44 - $(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ |
41 - $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm | 45 - $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm |
42 + $(BUILD_CC) $(BUILD_CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ | 46 + $(BUILD_CC) $(BUILD_CFLAGS) -DNO_FPINIT arithchk.c -lm ||\ |
43 + $(BUILD_CC) -DNO_LONG_LONG $(BUILD_CFLAGS) -DNO_FPINIT arithchk.c -lm | 47 + $(BUILD_CC) -DNO_LONG_LONG $(BUILD_CFLAGS) -DNO_FPINIT arithchk.c -lm |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 +XBLASLIB = | 138 +XBLASLIB = |
135 +# XBLASLIB = -lxblas | 139 +# XBLASLIB = -lxblas |
136 +# | 140 +# |
137 +# Names of generated libraries. | 141 +# Names of generated libraries. |
138 +# | 142 +# |
139 +LAPACKLIB = liblapack$(PLAT).a | 143 +LAPACKLIB = liblapack$(PLAT).a |
140 +F2CLIB = ../../F2CLIBS/libf2c.a | 144 +F2CLIB = ../../F2CLIBS/libf2c.a |
141 +TMGLIB = tmglib$(PLAT).a | 145 +TMGLIB = tmglib$(PLAT).a |
142 +EIGSRCLIB = eigsrc$(PLAT).a | 146 +EIGSRCLIB = eigsrc$(PLAT).a |
143 +LINSRCLIB = linsrc$(PLAT).a | 147 +LINSRCLIB = linsrc$(PLAT).a |
OLD | NEW |