diff options
| author | Robert Mustacchi <rm@joyent.com> | 2015-07-16 14:49:46 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-07-16 14:49:46 +0000 |
| commit | c7f75950de108acf779c4bc033cb41707fcfd807 (patch) | |
| tree | 24aca7de9a42c8a22fe6bc4073c81bf5fb7711ab /usr | |
| parent | 1eabb102d5893c3f803df3e564315dab0153bc66 (diff) | |
| download | illumos-joyent-c7f75950de108acf779c4bc033cb41707fcfd807.tar.gz | |
OS-4509 build issues after dmake integration
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/Makefile.master | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 57ce777708..ad515114f7 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -565,8 +565,7 @@ CPPFLAGS.first= # Please keep empty. Only lower makefiles should set this. CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \ $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \ $(ADJUNCT_PROTO:%=-I%/usr/include) -CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \ - $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include +CPPFLAGS.native=-I$(NATIVE_ADJUNCT)/include CPPFLAGS= $(CPPFLAGS.first) $(CPPFLAGS.master) AS_CPPFLAGS= $(CPPFLAGS.first) $(CPPFLAGS.master) JAVAFLAGS= -source 1.6 -target 1.6 -Xlint:deprecation,-options |