| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Tue, 27 Oct 2015 07:12:09 -0700 | |
| changeset 5257 | 0da26ce015ab |
| parent 1450 | 02791a89ea4f |
| permissions | -rw-r--r-- |
|
1450
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
1 |
|
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
2 |
Patch allows UL_LDFLAGS set in Makefile to be passed along to ocaml. |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
3 |
|
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
4 |
--- ocaml-3.11.2/configure-orig 2013-06-27 21:29:22.692330246 -0500 |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
5 |
+++ ocaml-3.11.2/configure 2013-06-27 21:29:38.111921104 -0500 |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
6 |
@@ -1534,6 +1534,10 @@ esac |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
7 |
bytecccompopts="$bytecccompopts $CFLAGS" |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
8 |
nativecccompopts="$nativecccompopts $CFLAGS" |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
9 |
|
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
10 |
+# Allow user defined C Compiler flags |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
11 |
+bytecccompopts="$bytecccompopts $CFLAGS" |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
12 |
+nativecccompopts="$nativecccompopts $CFLAGS" |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
13 |
+ |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
14 |
# Finish generated files |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
15 |
|
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
16 |
cclibs="$cclibs $mathlib" |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
17 |
@@ -1541,7 +1545,7 @@ cclibs="$cclibs $mathlib" |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
18 |
echo "BYTECC=$bytecc" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
19 |
echo "BYTECCCOMPOPTS=$bytecccompopts" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
20 |
echo "BYTECCLINKOPTS=$bytecclinkopts" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
21 |
-echo "BYTECCLIBS=$cclibs $dllib $curseslibs $pthread_link" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
22 |
+echo "BYTECCLIBS=$cclibs $dllib $curseslibs $pthread_link $UL_LDFLAGS" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
23 |
echo "BYTECCRPATH=$byteccrpath" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
24 |
echo "EXE=$exe" >> Makefile |
|
02791a89ea4f
17262870 Migrate ocaml to Userland
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
25 |
echo "SUPPORTS_SHARED_LIBRARIES=$shared_libraries_supported" >> Makefile |