108 endif |
108 endif |
109 |
109 |
110 |
110 |
111 ifneq ($(OS_VENDOR), Darwin) |
111 ifneq ($(OS_VENDOR), Darwin) |
112 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) |
112 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) |
|
113 else |
|
114 # bring in minimum version argument or we'll fail on OSX 10.10 |
|
115 SA_LFLAGS = $(LFLAGS) |
113 endif |
116 endif |
114 SA_LFLAGS += $(LDFLAGS_HASH_STYLE) |
117 SA_LFLAGS += $(LDFLAGS_HASH_STYLE) |
115 |
118 |
116 BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \ |
119 BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \ |
117 -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") |
120 -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") |