equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 # parfait is a bit unhappy (22527218) |
26 # parfait is a bit unhappy (22527218) |
27 export PARFAIT_BUILD=no |
27 export PARFAIT_BUILD=no |
28 |
28 |
101 echo "ac_add_options --enable-ipc" >> $(MOZCONFIG) ; \ |
101 echo "ac_add_options --enable-ipc" >> $(MOZCONFIG) ; \ |
102 echo "ac_add_options --enable-system-pixman" >> $(MOZCONFIG) ; \ |
102 echo "ac_add_options --enable-system-pixman" >> $(MOZCONFIG) ; \ |
103 echo "ac_add_options --enable-startup-notification" >> $(MOZCONFIG) ; \ |
103 echo "ac_add_options --enable-startup-notification" >> $(MOZCONFIG) ; \ |
104 echo "ac_add_options --enable-dtrace" >> $(MOZCONFIG) ; |
104 echo "ac_add_options --enable-dtrace" >> $(MOZCONFIG) ; |
105 |
105 |
106 CXXFLAGS += -Wno-invalid-offsetof |
106 CXXFLAGS += -Wno-invalid-offsetof -fpermissive |
|
107 CC += $(CC_BITS) |
|
108 CXX += $(CC_BITS) |
|
109 |
107 |
110 |
108 CONFIGURE_ENV += PKG_CONFIG_PATH=$(CONFIGURE_LIBDIR.$(BITS))/pkgconfig |
111 CONFIGURE_ENV += PKG_CONFIG_PATH=$(CONFIGURE_LIBDIR.$(BITS))/pkgconfig |
109 CONFIGURE_ENV += OS_DEFINES="-D__USE_LEGACY_PROTOTYPES__" |
112 CONFIGURE_ENV += OS_DEFINES="-D__USE_LEGACY_PROTOTYPES__" |
110 |
113 |
111 CONFIGURE_ENV += MOZCONFIG=$(MOZCONFIG) |
114 CONFIGURE_ENV += MOZCONFIG=$(MOZCONFIG) |