Print this page
OS-2552 add node-lockfd (v0.0.2) to platform
OS-2558 smartos-live should run tools from proto.strap, not proto
| Split |
Close |
| Expand all |
| Collapse all |
--- old/src/Makefile.defs
+++ new/src/Makefile.defs
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License, Version 1.0 only
6 6 # (the "License"). You may not use this file except in compliance
7 7 # with the License.
8 8 #
9 9 # You can obtain a copy of the license at COPYING
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at COPYING.
15 15 # If applicable, add the following below this CDDL HEADER, with the
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 # Copyright (c) 2012, Joyent, Inc.
22 22 #
23 23
24 24 BASE = $(PWD)
25 25 DESTDIR = $(BASE)/../proto
26 +NATIVEDIR = $(BASE)/../proto.strap
27 +ILLUMOS_SRC = $(BASE)/../projects/illumos/usr/src
26 28
27 29 ifeq ($(shell uname -s),Darwin)
28 30 MAKE = make
29 31 PATH = $(DESTDIR)/usr/bin:/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
30 32 else
31 33 MAKE = gmake
32 -PATH = $(DESTDIR)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
34 +PATH = $(NATIVEDIR)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
33 35 endif
34 36
35 37 PARALLEL = -j128
36 -GCC = $(DESTDIR)/usr/bin/gcc
37 -GXX = $(DESTDIR)/usr/bin/g++
38 +GCC = $(NATIVEDIR)/usr/bin/gcc
39 +GXX = $(NATIVEDIR)/usr/bin/g++
40 +
41 +CTFBINDIR = $(ILLUMOS_SRC)/tools/proto/root_i386-nd/opt/onbld/bin/i386
42 +CTFMERGE = $(CTFBINDIR)/ctfmerge
43 +CTFCONVERT = $(CTFBINDIR)/ctfconvert
38 44
39 45 SYSINCDIRS = /usr/include
40 46 SYSLIBDIRS = /usr/lib /lib
41 47
42 48 CPPFLAGS = $(SYSINCDIRS:%=-isystem $(DESTDIR)/%)
43 49 LDFLAGS = $(SYSLIBDIRS:%=-L$(DESTDIR)/%) -Wl,-zassert-deflib \
44 50 -Wl,-zfatal-warnings
45 51
46 52 PREFIX_NODE = $(DESTDIR)/usr/node/0.8
53 +NODE_EXEC = $(NATIVEDIR)/usr/node/0.8/bin/node
47 54
48 55 DEBUG_FLAGS = -g
49 56 WARN_FLAGS = -Wall -Wextra -Werror
50 57 PIC_FLAGS = -fPIC
51 58 OPT_FLAGS = -O2
52 59
53 60 NODE_CFLAGS = $(DEBUG_FLAGS) $(WARN_FLAGS) $(PIC_FLAGS) $(OPT_FLAGS)
54 61
55 62 STD_DEFS = -D_GNU_SOURCE
56 63 NODE_DEFS = -DBUILDING_NODE_EXTENSION
57 64 LF64_DEFS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
58 65 PIC_DEFS = -DPIC
59 66 NODE_INCS = -isystem $(PREFIX_NODE)/include/node -I.
60 67
61 68 NODE_CPPFLAGS = $(STD_DEFS) $(NODE_DEFS) $(LF64_DEFS) $(PIC_DEFS) $(NODE_INCS)
62 69
63 70 SHARED_FLAGS = -shared
64 71 ZTEXT = -Wl,-ztext
65 72 NODE_LIBDIR = -L$(PREFIX_NODE)/lib
66 73
67 74 NODE_LDFLAGS = $(SHARED_FLAGS) $(ZTEXT) $(NODE_LIBDIR)
68 75
69 76 SUBDIR_CC = CC="$(GCC)"
70 77 SUBDIR_CXX = CXX="$(GXX)"
71 78 SUBDIR_CPPFLAGS = CPPFLAGS="$(CPPFLAGS)"
72 79 SUBDIR_CFLAGS = CFLAGS="$(CFLAGS)"
73 80 SUBDIR_CXXFLAGS = CXXFLAGS="$(CXXFLAGS)"
74 81 SUBDIR_LDFLAGS = LDFLAGS="$(LDFLAGS)"
75 82 SUBDIR_LIBS = LIBS="$(LIBS)"
76 83 SUBDIR_MAKE = MAKE="$(MAKE)"
77 84 SUBDIR_DESTDIR = DESTDIR="$(DESTDIR)"
78 85
79 86 SUBDIR_ENV = \
80 87 $(SUBDIR_CC) \
81 88 $(SUBDIR_CXX) \
82 89 $(SUBDIR_CPPFLAGS) \
83 90 $(SUBDIR_CFLAGS) \
84 91 $(SUBDIR_CXXFLAGS) \
85 92 $(SUBDIR_LDFLAGS) \
86 93 $(SUBDIR_LIBS) \
87 94 $(SUBDIR_MAKE) \
88 95 $(SUBDIR_DESTDIR)
|
↓ open down ↓ |
32 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX