equal
deleted
inserted
replaced
37 |
37 |
38 include ../../make-rules/prep.mk |
38 include ../../make-rules/prep.mk |
39 include ../../make-rules/configure.mk |
39 include ../../make-rules/configure.mk |
40 include ../../make-rules/ips.mk |
40 include ../../make-rules/ips.mk |
41 |
41 |
42 CONFIGURE_BINDIR.32 = $(CONFIGURE_PREFIX)/gnu/bin |
42 # Need to reduce optimization level in order to successfully run the |
|
43 # configure test for detecting whether Solaris can detect stack overflow. |
|
44 # See CR #16954300. |
|
45 studio_OPT = -xO3 |
43 |
46 |
44 CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) |
47 CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) |
45 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" |
48 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" |
46 |
49 |
47 ASLR_MODE = $(ASLR_ENABLE) |
50 ASLR_MODE = $(ASLR_ENABLE) |
48 |
51 |
49 # common targets |
52 # common targets |
50 build: $(BUILD_32) |
53 build: $(BUILD_64) |
51 |
54 |
52 install: $(INSTALL_32) |
55 install: $(INSTALL_64) |
53 |
56 |
54 test: $(TEST_32) |
57 test: $(TEST_64) |
55 |
58 |
56 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
59 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
57 |
60 |
58 include ../../make-rules/depend.mk |
61 include ../../make-rules/depend.mk |