equal
deleted
inserted
replaced
34 |
34 |
35 include ../../make-rules/prep.mk |
35 include ../../make-rules/prep.mk |
36 include ../../make-rules/configure.mk |
36 include ../../make-rules/configure.mk |
37 include ../../make-rules/ips.mk |
37 include ../../make-rules/ips.mk |
38 |
38 |
|
39 # Solaris should really define these. See CR #15431883 and 15537286. |
|
40 CFLAGS += -Du_int8_t=uint8_t |
|
41 CFLAGS += -Du_int16_t=uint16_t |
|
42 CFLAGS += -Du_int32_t=uint32_t |
|
43 |
39 # Set -m32 or -m64 correctly for 32 and 64 bit versions. |
44 # Set -m32 or -m64 correctly for 32 and 64 bit versions. |
40 CC += $(CC_BITS) |
45 CC += $(CC_BITS) |
41 |
46 |
42 CONFIGURE_OPTIONS += --enable-static=no |
47 CONFIGURE_OPTIONS += --enable-static=no |
|
48 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" |
43 |
49 |
44 ASLR_MODE = $(ASLR_ENABLE) |
50 ASLR_MODE = $(ASLR_ENABLE) |
45 |
51 |
46 # common targets |
52 # common targets |
47 build: $(BUILD_32_and_64) |
53 build: $(BUILD_32_and_64) |